Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a)
  • Date: Tue, 9 Feb 2010 15:31:12 -0600

GIT changes to stable-rc-0.41 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

x11-libs/cairo/DEPENDS | 4 ++--
x11-libs/cairo/HISTORY | 5 +++++
x11-libs/cairo/SUB_DEPENDS | 5 +++--
3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cairo: SVG support requires libpng, bug 15569
(cherry picked from commit 5cfdcde13dcea62b2b3ec93d93dc4bba8bd982eb)

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index cf21093..ad9278f 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -29,8 +29,8 @@ optional_depends xcb-util \
"for XCB surface backend feature" &&

optional_depends libpng \
- "--enable-png" \
- "--disable-png" \
+ "--enable-png --enable-svg" \
+ "--disable-png --disable-svg" \
"for PNG support" &&

optional_depends glitz \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index fe57db7..b979762 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2010-02-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: libpng is also used for svg surface, en/disable svg
+ accordingly
+ * SUB_DEPENDS: SVG sub dependency requires libpng, bug #15569
+
2010-01-30 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated devel branch to 1.9.4

diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index b230956..322a4dd 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -3,9 +3,10 @@ case $THIS_SUB_DEPENDS in
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";;
+ depends libpng "--enable-png --enable-svg";;
PS) return 0;;
- SVG) return 0;;
+ SVG) message "Cairo with SVG support requested, forcing libpng dependency"
&&
+ depends libpng "--enable-png --enable-svg";;
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-rc-0.41 grimoire by Eric Sandall (7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a), Eric Sandall, 02/09/2010

Archive powered by MHonArc 2.6.24.

Top of Page