[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (75d99bbf47cfc12b9da8433bcd7152cb64bf830f)

Arwed von Merkatz scm at sourcemage.org
Thu Mar 5 13:18:58 EST 2009


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

 graphics-libs/poppler/DEPENDS  |    4 +++-
 graphics-libs/poppler/HISTORY  |    6 ++++++
 graphics-libs/poppler/TRIGGERS |    3 +++
 x11-libs/cairo/DEPENDS         |    6 +-----
 x11-libs/cairo/HISTORY         |    3 +++
 5 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 75d99bbf47cfc12b9da8433bcd7152cb64bf830f
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    cairo: freetype2 is hard depends, not optional

commit 2c901d89faa0dcb75644ddf5e436dc4970d44deb
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    poppler: work around one circular depends issue with gtk+2, cairo and poppler, partial fix for bug 14872

diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index db20592..fb3da13 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -31,10 +31,12 @@ optional_depends qt-x11 \
                  "--disable-poppler-qt" \
                  "for QT3 wrapper" &&
 
+if spell_ok cairo; then
 optional_depends cairo \
                  "--enable-cairo-output" \
                  "--disable-cairo-output" \
-                 "for cairo output" &&
+                 "for cairo output"
+fi &&
 
 optional_depends abiword \
                  "--enable-abiword-output" \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 9c67c85..69ff84b 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,9 @@
+2009-03-05 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DEPENDS: only optional depend on cairo if cairo is installed
+	* TRIGGERS: trigger cast_self on cairo cast, only register this
+	  trigger if cairo is not installed
+	  This is a partial fix/workaround for bug #14872
+
 2009-02-11 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.10.4
 
diff --git a/graphics-libs/poppler/TRIGGERS b/graphics-libs/poppler/TRIGGERS
new file mode 100755
index 0000000..08eca98
--- /dev/null
+++ b/graphics-libs/poppler/TRIGGERS
@@ -0,0 +1,3 @@
+if ! spell_ok cairo; then
+  on_cast cairo cast_self
+fi
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index f6d3195..47516ea 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,3 +1,4 @@
+depends freetype2 '--enable-ft' &&
 depends fontconfig &&
 depends pixman &&
 
@@ -42,11 +43,6 @@ optional_depends directfb \
                  "--disable-directfb" \
                  "for directfb surface backend feature" &&
 
-optional_depends freetype2 \
-                 "--enable-ft" \
-                 "--disable-ft" \
-                 "for FreeType font backend feature" &&
-
 optional_depends poppler \
                  "--enable-pdf" \
                  "--disable-pdf" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 02aa29e..93a9af6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2009-03-05 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DEPENDS: requires freetype2, not optional
+
 2009-02-22 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: Removed depends libpng, is already optional_depends
 



More information about the SM-Commit mailing list