diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /cairo | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (diff) | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 44 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 5 |
2 files changed, 1 insertions, 48 deletions
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index d13c1e4e135e..2234383941f9 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/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 ++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DDISABLE_SOME_FLOATING_POINT=1 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) @@ -189,20 +189,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/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 @@ @@ -217,34 +203,6 @@ 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 @@ diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 16a89bfad9a4..51854dcb8805 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -70,12 +70,7 @@ cairo_LDFLAGS=-L$(SOLARVER)$/$(INPATH)$/lib cairo_CPPFLAGS= -.IF "$(SYSTEM_ZLIB)"!="YES" -cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib -cairo_COMPRESS=z_compress -.ELSE cairo_COMPRESS=compress -.ENDIF cairo_CPPFLAGS+=$(INCLUDE) .IF "$(OS)"=="WNT" |