summaryrefslogtreecommitdiff
path: root/cairo
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-05-30 15:07:49 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-05-30 15:07:49 +0100
commit9eeeab292cf799a839439310feeee9ac752b0013 (patch)
treef9af8438291f1a8d07e698aa8f052901a55ee89f /cairo
parent499e7e89743bf10e3d290c81d3b86f4d86f0c50e (diff)
allow building non-system cairo with system libpng14
Diffstat (limited to 'cairo')
-rw-r--r--cairo/cairo-1.8.0.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index e693eb4cc019..d18396c0ac03 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -186,6 +186,15 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
{ echo "$as_me:$LINENO: checking for X" >&5
+@@ -31723,7 +31723,7 @@
+
+ if test "x$png_REQUIRES" = x; then
+ # libpng13 is GnuWin32's libpng-1.2.8 :-(
+- for l in libpng12 libpng13 libpng10 ; do
++ for l in libpng12 libpng13 libpng14 libpng10 ; do
+ if $PKG_CONFIG --exists $l ; then
+ png_REQUIRES=$l
+ use_png=yes
@@ -34097,7 +34129,7 @@
# The ps backend requires zlib.