diff options
| author | Arwed von Merkatz | 2009-10-07 20:03:09 +0200 |
|---|---|---|
| committer | Eric Sandall | 2009-10-09 13:17:28 -0700 |
| commit | 91e77a40ae722040d93600a111f2183c7db645b7 (patch) | |
| tree | a086fc3050385c695cec064c84ac9161259afafa | |
| parent | 251beb65bab833057bd5f17132a0095a109210fa (diff) | |
gtk+2: fix circular dependency, bug 15429
(Cherry-picked from efb9cbe)
| -rwxr-xr-x | x11-toolkits/gtk+2/DEPENDS | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk+2/HISTORY | 9 | ||||
| -rwxr-xr-x | x11-toolkits/gtk+2/PRE_BUILD | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS index 138ea0057f..1b329f4741 100755 --- a/x11-toolkits/gtk+2/DEPENDS +++ b/x11-toolkits/gtk+2/DEPENDS @@ -7,6 +7,14 @@ depends libxext && depends libxcursor && depends libxrender && +if spell_ok $SPELL; then + if spell_ok cairo; then + # sub_depend on svg support in cair for file + # print backend, requires this hack due to + # circular dependency + sub_depends cairo SVG + fi +fi && optional_depends libpng \ "--with-libpng" \ "--without-libpng" \ diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY index cd924fa067..e13381d015 100644 --- a/x11-toolkits/gtk+2/HISTORY +++ b/x11-toolkits/gtk+2/HISTORY @@ -1,3 +1,12 @@ +2009-10-07 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: sub_depend on cairo with SVG support if + gtk+2 and cairo are already installed, as those + 2 are dependencies of librsvg2, which provides + the SVG support in cairo + * PRE_BUILD: disable the file backend printing + module if cairo-svg support is not there + this fixes bug #15429 + 2009-10-01 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.18.1 diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD index 4538091fce..e4d16303b8 100755 --- a/x11-toolkits/gtk+2/PRE_BUILD +++ b/x11-toolkits/gtk+2/PRE_BUILD @@ -1,3 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/' modules/printbackends/cups/gtkcupsutils.c +sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/' modules/printbackends/cups/gtkcupsutils.c && +if [[ ! -f $INSTALL_ROOT/usr/include/cairo/cairo-svg.h ]]; then +sed -i 's/SUBDIRS = file/SUBDIRS = /' modules/printbackends/Makefile.in +fi |