diff options
author | Arwed von Merkatz | 2010-02-09 18:29:42 +0100 |
---|---|---|
committer | Eric Sandall | 2010-02-09 13:31:05 -0800 |
commit | 7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a (patch) | |
tree | 89ac721aad63fa2554881f923d3726845447ddad | |
parent | 06f3c8c65f8a51d2a2902075d4032ad917b0a881 (diff) |
cairo: SVG support requires libpng, bug 15569
(cherry picked from commit 5cfdcde13dcea62b2b3ec93d93dc4bba8bd982eb)
-rwxr-xr-x | x11-libs/cairo/DEPENDS | 4 | ||||
-rw-r--r-- | x11-libs/cairo/HISTORY | 5 | ||||
-rwxr-xr-x | x11-libs/cairo/SUB_DEPENDS | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS index cf21093689..ad9278fe75 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 fe57db718b..b979762573 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,8 @@ +2010-02-09 Arwed v. Merkatz <v.merkatz@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@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 b230956702..322a4dd755 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}" |