diff options
author | Arwed von Merkatz | 2010-04-12 18:11:51 +0200 |
---|---|---|
committer | Arwed von Merkatz | 2010-04-12 19:00:23 +0200 |
commit | e550abcb42e0cf02345f82354b9610fd4cfb3db4 (patch) | |
tree | 86259a961f7404f8f66f8773b0938a8429136457 | |
parent | a7e3c37e3ba6f711e1c6d67d0a40282cf5c5d6b4 (diff) |
gtk+2: always requires cairo with SVG, bug 15664
(cherry picked from commit 424cf3d07d80d2d776dc1c11c4e749755bc88606)
-rwxr-xr-x | x11-toolkits/gtk+2/DEPENDS | 10 | ||||
-rw-r--r-- | x11-toolkits/gtk+2/HISTORY | 6 | ||||
-rwxr-xr-x | x11-toolkits/gtk+2/PRE_BUILD | 5 |
3 files changed, 7 insertions, 14 deletions
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS index 739b56617f..fa78872f2e 100755 --- a/x11-toolkits/gtk+2/DEPENDS +++ b/x11-toolkits/gtk+2/DEPENDS @@ -1,20 +1,12 @@ depends glib2 && depends atk && depends pango && -depends -sub "PDF PS X" cairo && +depends -sub "PDF PS SVG X" cairo && depends libsm && 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 101a2bc7e3..b7fef1df06 100644 --- a/x11-toolkits/gtk+2/HISTORY +++ b/x11-toolkits/gtk+2/HISTORY @@ -1,3 +1,9 @@ +2010-04-12 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: always sub_depend on SVG in cairo, the circular dependency + is gone and it's required now, bug #15664 + * PRE_BUILD: removed, not needed anymore because SVG in cairo is + always required to be there + 2010-03-30 Vasil Yonkov <spirtbrat@sourcemage.org> * DETAILS: updated GTK_VER=stable to 2.20.0 diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD deleted file mode 100755 index 9cf74aad17..0000000000 --- a/x11-toolkits/gtk+2/PRE_BUILD +++ /dev/null @@ -1,5 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && -if [[ ! -f $INSTALL_ROOT/usr/include/cairo/cairo-svg.h ]]; then -sed -i 's/SUBDIRS = file/SUBDIRS = /' modules/printbackends/Makefile.in -fi |