diff options
Diffstat (limited to 'cairo/cairo-1.10.2.patch')
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 2234383941f9..d13c1e4e135e 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -38,7 +38,7 @@ DEFAULT_CFLAGS += -I. -I$(top_srcdir) DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) +DEFAULT_CFLAGS += $(SOLARINC) -+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DDISABLE_SOME_FLOATING_POINT=1 ++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) @@ -189,6 +189,20 @@ 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/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 @@ + #include "cairoint.h" + #include "cairo-error-private.h" + #include "cairo-output-stream-private.h" ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + + #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 2010-07-12 10:57:03.000000000 +0200 @@ -313,7 +313,11 @@ @@ -203,6 +217,34 @@ decimal_point_len = strlen (decimal_point); 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 2010-12-25 15:21:34.000000000 +0100 +@@ -57,7 +57,11 @@ + #include "cairo-type3-glyph-surface-private.h" + + #include <time.h> ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + + /* 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 2010-12-25 15:21:34.000000000 +0100 +@@ -72,7 +72,11 @@ + #include <stdio.h> + #include <ctype.h> + #include <time.h> ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + #include <errno.h> + + #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 2010-12-25 15:21:34.000000000 +0100 @@ -534,16 +534,16 @@ |