- release 5 (by relup.sh)

[packages/cairo.git] / cairo-link.patch

diff --git a/cairo-link.patch b/cairo-link.patch
index d5bfbe960eec28a78c8fe109805a6f585cb32efe..8bce68aa2e1dec6f463f1bbc91c9378c57531f8c 100644 (file)
--- a/cairo-link.patch
+++ b/cairo-link.patch
@@ -1,22 +1,11 @@
---- cairo-1.2.2/configure.ac.orig      2006-08-08 23:05:54.000000000 +0000
-+++ cairo-1.2.2/configure.ac   2006-08-09 07:42:54.315971000 +0000
-@@ -227,7 +227,7 @@
+--- cairo-1.12.4/configure.ac~ 2012-09-13 13:38:21.000000000 +0200
++++ cairo-1.12.4/configure.ac  2012-10-07 07:13:25.814449494 +0200
+@@ -71,7 +71,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib,
                     if test "x$no_x" = xyes; then
                       use_xlib="no (requires X development libraries)"
                     else
--                     xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+                     xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
+-                     xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
++                     xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
                       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
                     fi])
  ])
---- cairo-1.8.8/configure.ac~  2010-01-28 11:11:34.663816129 +0100
-+++ cairo-1.8.8/configure.ac   2010-01-28 11:13:43.651094955 +0100
-@@ -161,7 +161,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   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 libpng libpng14 libpng12 libpng13 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes