-lz was sucked in by freetype

1 files changed, 81 insertions, 63 deletions

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index b848625ec375..d4d24d5e69cc 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -1,3 +1,14 @@
+--- misc/cairo-1.10.2/build/Makefile.win32.features	2010-08-18 09:47:30.000000000 +0200
++++ misc/build/cairo-1.10.2/build/Makefile.win32.features	2010-08-18 09:47:30.000000000 +0200
+@@ -30,7 +30,7 @@
+ CAIRO_HAS_FC_FONT=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
+-CAIRO_HAS_SVG_SURFACE=1
++CAIRO_HAS_SVG_SURFACE=0
+ CAIRO_HAS_TEST_SURFACES=0
+ CAIRO_HAS_TEE_SURFACE=0
+ CAIRO_HAS_XML_SURFACE=0
 --- misc/cairo-1.10.2/build/Makefile.win32.common	2009-06-14 23:53:24.000000000 +0200
 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common	2009-06-14 23:53:24.000000000 +0200
 @@ -22,8 +22,8 @@
@@ -37,17 +48,6 @@
  
  $(CFG)/%-static.obj: %.c
  	@mkdir -p $(CFG)
---- misc/cairo-1.10.2/build/Makefile.win32.features	2010-08-18 09:47:30.000000000 +0200
-+++ misc/build/cairo-1.10.2/build/Makefile.win32.features	2010-08-18 09:47:30.000000000 +0200
-@@ -30,7 +30,7 @@
- CAIRO_HAS_FC_FONT=0
- CAIRO_HAS_PS_SURFACE=1
- CAIRO_HAS_PDF_SURFACE=1
--CAIRO_HAS_SVG_SURFACE=1
-+CAIRO_HAS_SVG_SURFACE=0
- CAIRO_HAS_TEST_SURFACES=0
- CAIRO_HAS_TEE_SURFACE=0
- CAIRO_HAS_XML_SURFACE=0
 --- misc/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
 +++ misc/build/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
 @@ -1272,7 +1272,7 @@
@@ -59,6 +59,67 @@
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
++++ misc/build/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
+@@ -33,13 +33,8 @@
+ 
+ dnl ===========================================================================
+ 
+-AC_CHECK_LIB(z, compress,
+-	 [AC_CHECK_HEADER(zlib.h, [
+ 	  have_libz=yes
+ 	  AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
+-	 ],
+-	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
+-	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
+
+ AC_CHECK_LIB(dl, dlsym,
+ 	     [have_dlsym=yes; have_dl=yes],
+@@ -279,7 +271,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 libpng libpng14 libpng12 libpng13 libpng10; do
++    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
+@@ -455,7 +455,7 @@
+ 	AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
+ 			   [AC_MSG_RESULT($FREETYPE_VERSION - OK)
+ 			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
++			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`],
+ 			   [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
+ 			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"])
+       fi
+@@ -505,7 +505,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
+     # The ps backend requires zlib.
+     use_ps=$have_libz
+-    ps_NONPKGCONFIG_LIBS=-lz
++    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
+@@ -542,7 +542,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
+     # The pdf backend requires zlib.
+     use_pdf=$have_libz
+-    pdf_NONPKGCONFIG_LIBS=-lz
++    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
+@@ -623,7 +623,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
+ CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
+     use_xml=$have_libz
+-    xml_NONPKGCONFIG_LIBS=-lz
++    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
 --- misc/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
 +++ misc/build/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
 @@ -19259,61 +19259,11 @@
@@ -132,6 +193,15 @@
        if $PKG_CONFIG --exists $l ; then
          png_REQUIRES=$l
          use_png=yes
+@@ -29424,7 +29424,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK" >&5
+ $as_echo "$FREETYPE_VERSION - OK" >&6; }
+ 			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`
++			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`
+     else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - Too old" >&5
+ $as_echo "$FREETYPE_VERSION - Too old" >&6; }
+ 			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"
 @@ -30121,7 +30121,7 @@
  
      # The ps backend requires zlib.
@@ -159,58 +229,6 @@
  
  			cairo_cv_xml_use=$use_xml
  			cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
---- misc/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
-+++ misc/build/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
-@@ -33,13 +33,8 @@
- 
- dnl ===========================================================================
- 
--AC_CHECK_LIB(z, compress,
--	 [AC_CHECK_HEADER(zlib.h, [
- 	  have_libz=yes
- 	  AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
--	 ],
--	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
--	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
-
- AC_CHECK_LIB(dl, dlsym,
- 	     [have_dlsym=yes; have_dl=yes],
-@@ -279,7 +271,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 libpng libpng14 libpng12 libpng13 libpng10; do
-+    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes
-@@ -505,7 +505,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
-     # The ps backend requires zlib.
-     use_ps=$have_libz
--    ps_NONPKGCONFIG_LIBS=-lz
-+    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
-@@ -542,7 +542,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
-     # The pdf backend requires zlib.
-     use_pdf=$have_libz
--    pdf_NONPKGCONFIG_LIBS=-lz
-+    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
-@@ -623,7 +623,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
- CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
-     use_xml=$have_libz
--    xml_NONPKGCONFIG_LIBS=-lz
-+    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
 --- misc/cairo-1.10.2/src/cairo-deflate-stream.c	2010-06-18 13:47:12.000000000 +0200
 +++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c	2010-06-18 13:47:12.000000000 +0200
 @@ -37,7 +37,11 @@