Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.38 grimoire by Arwed von Merkatz (c3a1db6d9a5afbae394737b4727825614c4d530f)

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-0.38 grimoire by Arwed von Merkatz (c3a1db6d9a5afbae394737b4727825614c4d530f)
  • Date: Tue, 1 Dec 2009 23:55:31 -0600

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

x11-libs/cairo/DEPENDS | 15 ---------------
x11-libs/cairo/HISTORY | 8 ++++++++
x11-libs/cairo/PRE_SUB_DEPENDS | 6 +++---
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 6 +++---
x11-libs/cairo/SUB_DEPENDS | 9 +++------
5 files changed, 17 insertions(+), 27 deletions(-)

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

cairo: removed bogus dependencies causing problems, bug 15402
(cherry picked from commit 3a2cc1a371af0367e58fe05e4194820add1a1ad6)

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 47516ea..cf21093 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -43,21 +43,6 @@ optional_depends directfb \
"--disable-directfb" \
"for directfb surface backend feature" &&

-optional_depends poppler \
- "--enable-pdf" \
- "--disable-pdf" \
- "for PDF surface backend feature" &&
-
-optional_depends ghostscript \
- "--enable-ps" \
- "--disable-ps" \
- "for PS surface backend feature" &&
-
-optional_depends librsvg2 \
- "--enable-svg" \
- "--disable-svg" \
- "for SVG surface backend feature" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 76db0b2..d70e717 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,11 @@
+2009-12-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed optional_depends on poppler, librsvg2 and
+ ghostscript, all of those are only used for the testsuite,
+ fixes bug #15402
+ * PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: return true for SVG,
+ PDF and PS sub depends if the corresponding header file exists
+ * SUB_DEPENDS: always return true for SVG, PDF and PS sub_depends.
+
2009-08-25 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^all^PRE_SUB_DEPENDS: Update with PNG support (Bug #15368)

diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index d53513c..3708b1b 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,9 +1,9 @@
case $THIS_SUB_DEPENDS in
- PDF) is_depends_enabled $SPELL poppler;;
+ PDF) [[ -f /usr/include/cairo/cairo-pdf.h ]];;
XCB) is_depends_enabled $SPELL xcb-util;;
PNG) is_depends_enabled $SPELL libpng;;
- PS) is_depends_enabled $SPELL ghostscript;;
- SVG) is_depends_enabled $SPELL librsvg2;;
+ PS) [[ -f /usr/include/cairo/cairo-ps.h ]];;
+ SVG) [[ -f /usr/include/cairo/cairo-svg.h ]];;
X) is_depends_enabled $SPELL libx11;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index d53513c..3708b1b 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,9 +1,9 @@
case $THIS_SUB_DEPENDS in
- PDF) is_depends_enabled $SPELL poppler;;
+ PDF) [[ -f /usr/include/cairo/cairo-pdf.h ]];;
XCB) is_depends_enabled $SPELL xcb-util;;
PNG) is_depends_enabled $SPELL libpng;;
- PS) is_depends_enabled $SPELL ghostscript;;
- SVG) is_depends_enabled $SPELL librsvg2;;
+ PS) [[ -f /usr/include/cairo/cairo-ps.h ]];;
+ SVG) [[ -f /usr/include/cairo/cairo-svg.h ]];;
X) is_depends_enabled $SPELL libx11;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index c18f4de..b230956 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,14 +1,11 @@
case $THIS_SUB_DEPENDS in
- PDF) message "Cairo with PDF support requested, forcing poppler
dependency" &&
- depends poppler "--enable-pdf";;
+ PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
depends xcb-util "--enable-xcb";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
depends libpng "--enable-png";;
- PS) message "Cairo with PS support requested, forcing ghostscript
dependency" &&
- depends ghostscript "--enable-ps";;
- SVG) message "Cairo with SVG support requested, forcing libsvrg2
dependency" &&
- depends librsvg2 "--enable-svg";;
+ PS) return 0;;
+ SVG) return 0;;
X) message "Cairo with Xlib support requested, forcing libx11
dependency" &&
depends libx11 "--enable-xlib";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"



  • [SM-Commit] GIT changes to stable-0.38 grimoire by Arwed von Merkatz (c3a1db6d9a5afbae394737b4727825614c4d530f), Arwed von Merkatz, 12/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page