Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.31 grimoire by Arwed von Merkatz (472b795120c998c6cc50d9d423c83deec8c2e4af)

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 stable-rc-0.31 grimoire by Arwed von Merkatz (472b795120c998c6cc50d9d423c83deec8c2e4af)
  • Date: Fri, 6 Mar 2009 11:16:06 -0600

GIT changes to stable-rc-0.31 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 +++
3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 472b795120c998c6cc50d9d423c83deec8c2e4af
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
(cherry picked from commit 2c901d89faa0dcb75644ddf5e436dc4970d44deb)

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



  • [SM-Commit] GIT changes to stable-rc-0.31 grimoire by Arwed von Merkatz (472b795120c998c6cc50d9d423c83deec8c2e4af), Arwed von Merkatz, 03/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page