diff options
| author | Arwed von Merkatz | 2009-03-05 19:16:40 +0100 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-03-06 18:15:22 +0100 |
| commit | 472b795120c998c6cc50d9d423c83deec8c2e4af (patch) | |
| tree | 91541351de368536145f8e1b8c280146947312f3 | |
| parent | 7bbb8b2c685032239a61c833b162ea3e965c6528 (diff) | |
poppler: work around one circular depends issue with gtk+2, cairo and poppler, partial fix for bug 14872
(cherry picked from commit 2c901d89faa0dcb75644ddf5e436dc4970d44deb)
| -rwxr-xr-x | graphics-libs/poppler/DEPENDS | 4 | ||||
| -rw-r--r-- | graphics-libs/poppler/HISTORY | 6 | ||||
| -rwxr-xr-x | graphics-libs/poppler/TRIGGERS | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS index db20592b84..fb3da13681 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 9c67c85ecf..69ff84bfcf 100644 --- a/graphics-libs/poppler/HISTORY +++ b/graphics-libs/poppler/HISTORY @@ -1,3 +1,9 @@ +2009-03-05 Arwed v. Merkatz <v.merkatz@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@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 0000000000..08eca98d03 --- /dev/null +++ b/graphics-libs/poppler/TRIGGERS @@ -0,0 +1,3 @@ +if ! spell_ok cairo; then + on_cast cairo cast_self +fi |