Trying to get the linking with internal zlib right

1 files changed, 64 insertions, 10 deletions

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 05cab07570f1..b848625ec375 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -1,5 +1,5 @@
 --- 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	2011-12-16 11:50:50.600524156 +0100
++++ misc/build/cairo-1.10.2/build/Makefile.win32.common	2009-06-14 23:53:24.000000000 +0200
 @@ -22,8 +22,8 @@
  OPT := -MD -O2
  endif
@@ -38,7 +38,7 @@
  $(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	2011-12-16 11:49:42.998709720 +0100
++++ 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
@@ -49,7 +49,7 @@
  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	2011-12-16 11:57:32.007884203 +0100
++++ misc/build/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
 @@ -1272,7 +1272,7 @@
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -60,7 +60,7 @@
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
-+++ misc/build/cairo-1.10.2/configure	2011-12-16 13:21:50.143725559 +0100
++++ misc/build/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
 @@ -19259,61 +19259,11 @@
  rm -f confcache
  
@@ -132,8 +132,35 @@
        if $PKG_CONFIG --exists $l ; then
          png_REQUIRES=$l
          use_png=yes
+@@ -30121,7 +30121,7 @@
+ 
+     # The ps backend requires zlib.
+     use_ps=$have_libz
+-    ps_NONPKGCONFIG_LIBS=-lz
++    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_ps_use=$use_ps
+ 			cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -30549,7 +30549,7 @@
+ 
+     # The pdf backend requires zlib.
+     use_pdf=$have_libz
+-    pdf_NONPKGCONFIG_LIBS=-lz
++    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_pdf_use=$use_pdf
+ 			cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -32296,7 +32296,7 @@
+ 
+ 
+     use_xml=$have_libz
+-    xml_NONPKGCONFIG_LIBS=-lz
++    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			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	2011-12-16 11:57:32.007884203 +0100
++++ misc/build/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
 @@ -33,13 +33,8 @@
  
  dnl ===========================================================================
@@ -157,8 +184,35 @@
        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	2011-12-16 11:48:52.381857312 +0100
++++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c	2010-06-18 13:47:12.000000000 +0200
 @@ -37,7 +37,11 @@
  #include "cairoint.h"
  #include "cairo-error-private.h"
@@ -172,7 +226,7 @@
  #define BUFFER_SIZE 16384
  
 --- misc/cairo-1.10.2/src/cairo-output-stream.c	2010-07-12 10:57:03.000000000 +0200
-+++ misc/build/cairo-1.10.2/src/cairo-output-stream.c	2011-12-16 11:48:52.389858238 +0100
++++ misc/build/cairo-1.10.2/src/cairo-output-stream.c	2010-07-12 10:57:03.000000000 +0200
 @@ -313,7 +313,11 @@
  	d = 0.0;
  
@@ -186,7 +240,7 @@
  
      assert (decimal_point_len != 0);
 --- misc/cairo-1.10.2/src/cairo-pdf-surface.c	2010-12-25 15:21:34.000000000 +0100
-+++ misc/build/cairo-1.10.2/src/cairo-pdf-surface.c	2011-12-16 11:48:52.384857660 +0100
++++ misc/build/cairo-1.10.2/src/cairo-pdf-surface.c	2010-12-25 15:21:34.000000000 +0100
 @@ -57,7 +57,11 @@
  #include "cairo-type3-glyph-surface-private.h"
  
@@ -200,7 +254,7 @@
  /* Issues:
   *
 --- misc/cairo-1.10.2/src/cairo-ps-surface.c	2010-12-25 15:21:34.000000000 +0100
-+++ misc/build/cairo-1.10.2/src/cairo-ps-surface.c	2011-12-16 11:48:52.388858122 +0100
++++ misc/build/cairo-1.10.2/src/cairo-ps-surface.c	2010-12-25 15:21:34.000000000 +0100
 @@ -72,7 +72,11 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -214,7 +268,7 @@
  
  #define DEBUG_PS 0
 --- misc/cairo-1.10.2/src/cairo-ft-font.c	2010-12-25 15:21:34.000000000 +0100
-+++ misc/build/cairo-1.10.2/src/cairo-ft-font.c	2011-12-16 13:40:11.921257695 +0100
++++ misc/build/cairo-1.10.2/src/cairo-ft-font.c	2010-12-25 15:21:34.000000000 +0100
 @@ -534,16 +534,16 @@
      ret = FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &font_face);
      if (ret == FcResultMatch)