1*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo-1.8.0/build/Makefile.win32.common 2*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/build/Makefile.win32.common 2008-09-25 14:36:35.000000000 +0300 3*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/build/Makefile.win32.common 2008-11-14 22:20:08.000000000 +0200 4*cdf0e10cSrcweir@@ -18,8 +18,8 @@ 5*cdf0e10cSrcweir OPT := -O2 6*cdf0e10cSrcweir endif 7*cdf0e10cSrcweir 8*cdf0e10cSrcweir-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman 9*cdf0e10cSrcweir-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib 10*cdf0e10cSrcweir+PIXMAN_CFLAGS := -I$(SOLARSRC)/cairo/$(INPATH)/inc 11*cdf0e10cSrcweir+PIXMAN_LIBS := $(SOLARSRC)/cairo/$(INPATH)/lib/pixman-1.lib 12*cdf0e10cSrcweir 13*cdf0e10cSrcweir CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib 14*cdf0e10cSrcweir ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) 15*cdf0e10cSrcweir@@ -27,13 +27,15 @@ 16*cdf0e10cSrcweir endif 17*cdf0e10cSrcweir ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) 18*cdf0e10cSrcweir else 19*cdf0e10cSrcweir-CAIRO_LIBS += zdll.lib 20*cdf0e10cSrcweir+CAIRO_LIBS += zlib.lib 21*cdf0e10cSrcweir endif 22*cdf0e10cSrcweir 23*cdf0e10cSrcweir DEFAULT_CFLAGS = -MD -nologo $(OPT) 24*cdf0e10cSrcweir DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE 25*cdf0e10cSrcweir DEFAULT_CFLAGS += -I. -I$(top_srcdir) 26*cdf0e10cSrcweir DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) 27*cdf0e10cSrcweir+DEFAULT_CFLAGS += $(SOLARINC) 28*cdf0e10cSrcweir+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX 29*cdf0e10cSrcweir 30*cdf0e10cSrcweir CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) 31*cdf0e10cSrcweir 32*cdf0e10cSrcweir@@ -55,7 +57,7 @@ 33*cdf0e10cSrcweir 34*cdf0e10cSrcweir $(CFG)/%.obj: %.c 35*cdf0e10cSrcweir @mkdir -p $(CFG) 36*cdf0e10cSrcweir- @$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $< 37*cdf0e10cSrcweir+ $(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $< 38*cdf0e10cSrcweir 39*cdf0e10cSrcweir $(CFG)/%-static.obj: %.c 40*cdf0e10cSrcweir @mkdir -p $(CFG) 41*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cairo-1.8.0/build/Makefile.win32.features 42*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/build/Makefile.win32.features 2008-09-25 02:15:49.000000000 +0300 43*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/build/Makefile.win32.features 2008-11-04 22:19:52.000000000 +0200 44*cdf0e10cSrcweir@@ -10,11 +10,11 @@ 45*cdf0e10cSrcweir CAIRO_HAS_WIN32_FONT=1 46*cdf0e10cSrcweir CAIRO_HAS_OS2_SURFACE=0 47*cdf0e10cSrcweir CAIRO_HAS_BEOS_SURFACE=0 48*cdf0e10cSrcweir-CAIRO_HAS_PNG_FUNCTIONS=1 49*cdf0e10cSrcweir+CAIRO_HAS_PNG_FUNCTIONS=1 50*cdf0e10cSrcweir CAIRO_HAS_GLITZ_SURFACE=0 51*cdf0e10cSrcweir CAIRO_HAS_DIRECTFB_SURFACE=0 52*cdf0e10cSrcweir CAIRO_HAS_FT_FONT=0 53*cdf0e10cSrcweir CAIRO_HAS_PS_SURFACE=1 54*cdf0e10cSrcweir CAIRO_HAS_PDF_SURFACE=1 55*cdf0e10cSrcweir-CAIRO_HAS_SVG_SURFACE=1 56*cdf0e10cSrcweir+CAIRO_HAS_SVG_SURFACE=0 57*cdf0e10cSrcweir CAIRO_HAS_TEST_SURFACES=0 58*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure 59*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/configure 2008-09-26 01:57:30.000000000 +0300 60*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/configure 2008-11-04 22:21:26.000000000 +0200 61*cdf0e10cSrcweir@@ -4397,7 +4397,7 @@ 62*cdf0e10cSrcweir 63*cdf0e10cSrcweir cygwin*) 64*cdf0e10cSrcweir # func_win32_libid is a shell function defined in ltmain.sh 65*cdf0e10cSrcweir- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 66*cdf0e10cSrcweir+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 67*cdf0e10cSrcweir lt_cv_file_magic_cmd='func_win32_libid' 68*cdf0e10cSrcweir ;; 69*cdf0e10cSrcweir 70*cdf0e10cSrcweir@@ -4406,7 +4406,7 @@ 71*cdf0e10cSrcweir # func_win32_libid shell function, so use a weaker test based on 'objdump', 72*cdf0e10cSrcweir # unless we find 'file', for example because we are cross-compiling. 73*cdf0e10cSrcweir if ( file / ) >/dev/null 2>&1; then 74*cdf0e10cSrcweir- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 75*cdf0e10cSrcweir+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 76*cdf0e10cSrcweir lt_cv_file_magic_cmd='func_win32_libid' 77*cdf0e10cSrcweir else 78*cdf0e10cSrcweir lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 79*cdf0e10cSrcweir@@ -25304,19 +25304,39 @@ 80*cdf0e10cSrcweir rm -f confcache 81*cdf0e10cSrcweir 82*cdf0e10cSrcweir 83*cdf0e10cSrcweir-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 84*cdf0e10cSrcweir-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } 85*cdf0e10cSrcweir-if test "${ac_cv_lib_z_compress+set}" = set; then 86*cdf0e10cSrcweir+save_libs="$LIBS" 87*cdf0e10cSrcweir+LIBS="$LIBS $ZLIB3RDLIB" 88*cdf0e10cSrcweir+ 89*cdf0e10cSrcweir+for ac_func in $COMPRESS 90*cdf0e10cSrcweir+do 91*cdf0e10cSrcweir+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 92*cdf0e10cSrcweir+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 93*cdf0e10cSrcweir+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } 94*cdf0e10cSrcweir+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then 95*cdf0e10cSrcweir echo $ECHO_N "(cached) $ECHO_C" >&6 96*cdf0e10cSrcweir else 97*cdf0e10cSrcweir- ac_check_lib_save_LIBS=$LIBS 98*cdf0e10cSrcweir-LIBS="-lz $LIBS" 99*cdf0e10cSrcweir-cat >conftest.$ac_ext <<_ACEOF 100*cdf0e10cSrcweir+ cat >conftest.$ac_ext <<_ACEOF 101*cdf0e10cSrcweir /* confdefs.h. */ 102*cdf0e10cSrcweir _ACEOF 103*cdf0e10cSrcweir cat confdefs.h >>conftest.$ac_ext 104*cdf0e10cSrcweir cat >>conftest.$ac_ext <<_ACEOF 105*cdf0e10cSrcweir /* end confdefs.h. */ 106*cdf0e10cSrcweir+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 107*cdf0e10cSrcweir+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ 108*cdf0e10cSrcweir+#define $ac_func innocuous_$ac_func 109*cdf0e10cSrcweir+ 110*cdf0e10cSrcweir+/* System header to define __stub macros and hopefully few prototypes, 111*cdf0e10cSrcweir+ which can conflict with char $ac_func (); below. 112*cdf0e10cSrcweir+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 113*cdf0e10cSrcweir+ <limits.h> exists even on freestanding compilers. */ 114*cdf0e10cSrcweir+ 115*cdf0e10cSrcweir+#ifdef __STDC__ 116*cdf0e10cSrcweir+# include <limits.h> 117*cdf0e10cSrcweir+#else 118*cdf0e10cSrcweir+# include <assert.h> 119*cdf0e10cSrcweir+#endif 120*cdf0e10cSrcweir+ 121*cdf0e10cSrcweir+#undef $ac_func 122*cdf0e10cSrcweir 123*cdf0e10cSrcweir /* Override any GCC internal prototype to avoid an error. 124*cdf0e10cSrcweir Use char because int might match the return type of a GCC 125*cdf0e10cSrcweir@@ -25324,11 +25344,18 @@ 126*cdf0e10cSrcweir #ifdef __cplusplus 127*cdf0e10cSrcweir extern "C" 128*cdf0e10cSrcweir #endif 129*cdf0e10cSrcweir-char compress (); 130*cdf0e10cSrcweir+char $ac_func (); 131*cdf0e10cSrcweir+/* The GNU C library defines this for functions which it implements 132*cdf0e10cSrcweir+ to always fail with ENOSYS. Some functions are actually named 133*cdf0e10cSrcweir+ something starting with __ and the normal name is an alias. */ 134*cdf0e10cSrcweir+#if defined __stub_$ac_func || defined __stub___$ac_func 135*cdf0e10cSrcweir+choke me 136*cdf0e10cSrcweir+#endif 137*cdf0e10cSrcweir+ 138*cdf0e10cSrcweir int 139*cdf0e10cSrcweir main () 140*cdf0e10cSrcweir { 141*cdf0e10cSrcweir-return compress (); 142*cdf0e10cSrcweir+return $ac_func (); 143*cdf0e10cSrcweir ; 144*cdf0e10cSrcweir return 0; 145*cdf0e10cSrcweir } 146*cdf0e10cSrcweir@@ -25351,22 +25378,25 @@ 147*cdf0e10cSrcweir test ! -s conftest.err 148*cdf0e10cSrcweir } && test -s conftest$ac_exeext && 149*cdf0e10cSrcweir $as_test_x conftest$ac_exeext; then 150*cdf0e10cSrcweir- ac_cv_lib_z_compress=yes 151*cdf0e10cSrcweir+ eval "$as_ac_var=yes" 152*cdf0e10cSrcweir else 153*cdf0e10cSrcweir echo "$as_me: failed program was:" >&5 154*cdf0e10cSrcweir sed 's/^/| /' conftest.$ac_ext >&5 155*cdf0e10cSrcweir 156*cdf0e10cSrcweir- ac_cv_lib_z_compress=no 157*cdf0e10cSrcweir+ eval "$as_ac_var=no" 158*cdf0e10cSrcweir fi 159*cdf0e10cSrcweir 160*cdf0e10cSrcweir rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 161*cdf0e10cSrcweir conftest$ac_exeext conftest.$ac_ext 162*cdf0e10cSrcweir-LIBS=$ac_check_lib_save_LIBS 163*cdf0e10cSrcweir fi 164*cdf0e10cSrcweir-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 165*cdf0e10cSrcweir-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; } 166*cdf0e10cSrcweir-if test $ac_cv_lib_z_compress = yes; then 167*cdf0e10cSrcweir- if test "${ac_cv_header_zlib_h+set}" = set; then 168*cdf0e10cSrcweir+ac_res=`eval echo '${'$as_ac_var'}'` 169*cdf0e10cSrcweir+ { echo "$as_me:$LINENO: result: $ac_res" >&5 170*cdf0e10cSrcweir+echo "${ECHO_T}$ac_res" >&6; } 171*cdf0e10cSrcweir+if test `eval echo '${'$as_ac_var'}'` = yes; then 172*cdf0e10cSrcweir+ cat >>confdefs.h <<_ACEOF 173*cdf0e10cSrcweir+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 174*cdf0e10cSrcweir+_ACEOF 175*cdf0e10cSrcweir+ if test "${ac_cv_header_zlib_h+set}" = set; then 176*cdf0e10cSrcweir { echo "$as_me:$LINENO: checking for zlib.h" >&5 177*cdf0e10cSrcweir echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } 178*cdf0e10cSrcweir if test "${ac_cv_header_zlib_h+set}" = set; then 179*cdf0e10cSrcweir@@ -25506,7 +25536,9 @@ 180*cdf0e10cSrcweir else 181*cdf0e10cSrcweir have_libz="no (requires zlib http://www.gzip.org/zlib/)" 182*cdf0e10cSrcweir fi 183*cdf0e10cSrcweir+done 184*cdf0e10cSrcweir 185*cdf0e10cSrcweir+LIBS="$save_libs" 186*cdf0e10cSrcweir 187*cdf0e10cSrcweir 188*cdf0e10cSrcweir { echo "$as_me:$LINENO: checking for X" >&5 189*cdf0e10cSrcweir@@ -34097,7 +34129,7 @@ 190*cdf0e10cSrcweir 191*cdf0e10cSrcweir # The ps backend requires zlib. 192*cdf0e10cSrcweir use_ps=$have_libz 193*cdf0e10cSrcweir- ps_NONPKGCONFIG_LIBS=-lz 194*cdf0e10cSrcweir+ ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB 195*cdf0e10cSrcweir 196*cdf0e10cSrcweir cairo_cv_ps_use=$use_ps 197*cdf0e10cSrcweir cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" 198*cdf0e10cSrcweir@@ -34444,7 +34476,7 @@ 199*cdf0e10cSrcweir 200*cdf0e10cSrcweir # The pdf backend requires zlib. 201*cdf0e10cSrcweir use_pdf=$have_libz 202*cdf0e10cSrcweir- pdf_NONPKGCONFIG_LIBS=-lz 203*cdf0e10cSrcweir+ pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB 204*cdf0e10cSrcweir 205*cdf0e10cSrcweir cairo_cv_pdf_use=$use_pdf 206*cdf0e10cSrcweir cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" 207*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c 208*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c 2008-09-25 13:03:43.000000000 +0300 209*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/src/cairo-deflate-stream.c 2008-11-14 22:21:00.000000000 +0200 210*cdf0e10cSrcweir@@ -36,7 +36,11 @@ 211*cdf0e10cSrcweir 212*cdf0e10cSrcweir #include "cairoint.h" 213*cdf0e10cSrcweir #include "cairo-output-stream-private.h" 214*cdf0e10cSrcweir+#ifdef ZLIB_FIX 215*cdf0e10cSrcweir+#include <zlib/zlib.h> 216*cdf0e10cSrcweir+#else 217*cdf0e10cSrcweir #include <zlib.h> 218*cdf0e10cSrcweir+#endif 219*cdf0e10cSrcweir 220*cdf0e10cSrcweir #define BUFFER_SIZE 16384 221*cdf0e10cSrcweir 222*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c misc/build/cairo-1.8.0/src/cairo-pdf-surface.c 223*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c 2008-09-25 14:36:35.000000000 +0300 224*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/src/cairo-pdf-surface.c 2008-11-14 22:20:41.000000000 +0200 225*cdf0e10cSrcweir@@ -51,7 +51,11 @@ 226*cdf0e10cSrcweir #include "cairo-type3-glyph-surface-private.h" 227*cdf0e10cSrcweir 228*cdf0e10cSrcweir #include <time.h> 229*cdf0e10cSrcweir+#ifdef ZLIB_FIX 230*cdf0e10cSrcweir+#include <zlib/zlib.h> 231*cdf0e10cSrcweir+#else 232*cdf0e10cSrcweir #include <zlib.h> 233*cdf0e10cSrcweir+#endif 234*cdf0e10cSrcweir 235*cdf0e10cSrcweir /* Issues: 236*cdf0e10cSrcweir * 237*cdf0e10cSrcweirdiff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.0/src/cairo-ps-surface.c 238*cdf0e10cSrcweir--- misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c 2008-09-25 14:36:35.000000000 +0300 239*cdf0e10cSrcweir+++ misc/build/cairo-1.8.0/src/cairo-ps-surface.c 2008-11-14 22:21:33.000000000 +0200 240*cdf0e10cSrcweir@@ -67,7 +67,11 @@ 241*cdf0e10cSrcweir #include <stdio.h> 242*cdf0e10cSrcweir #include <ctype.h> 243*cdf0e10cSrcweir #include <time.h> 244*cdf0e10cSrcweir+#ifdef ZLIB_FIX 245*cdf0e10cSrcweir+#include <zlib/zlib.h> 246*cdf0e10cSrcweir+#else 247*cdf0e10cSrcweir #include <zlib.h> 248*cdf0e10cSrcweir+#endif 249*cdf0e10cSrcweir #include <errno.h> 250*cdf0e10cSrcweir 251*cdf0e10cSrcweir #define DEBUG_PS 0 252