Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (efb9cbef9f233f7d8b2c7f5addcac99371f5d733)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (efb9cbef9f233f7d8b2c7f5addcac99371f5d733)
  • Date: Wed, 7 Oct 2009 13:03:35 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

x11-toolkits/gtk+2/DEPENDS | 8 ++++++++
x11-toolkits/gtk+2/HISTORY | 9 +++++++++
x11-toolkits/gtk+2/PRE_BUILD | 5 ++++-
3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit efb9cbef9f233f7d8b2c7f5addcac99371f5d733
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gtk+2: fix circular dependency, bug 15429

diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 138ea00..1b329f4 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 83ccd0c..2d7d8a1 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 AT 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-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.18.2

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
index 4538091..e4d1630 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



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (efb9cbef9f233f7d8b2c7f5addcac99371f5d733), Arwed von Merkatz, 10/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page