diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 15:47:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 23:34:26 +0200 |
| commit | 3c38b7727a3deab37c5e9b822cec53c081e2b6e3 (patch) | |
| tree | 61b40e23ba463a235d7bc41028630a068f3c4fe2 /cairo | |
| parent | e567baf92c0fc71e862a2cf07e029576ee36cd77 (diff) | |
zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 2 | ||||
| -rw-r--r-- | cairo/cairo/cairo-1.10.2.patch | 44 |
2 files changed, 2 insertions, 44 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 0326b5c05c2c..4ba9023677f4 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(debug),STRIP=" ") \ - CFLAGS="$(if $(debug),-g) $(SOLARINC)" \ + CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \ LDFLAGS='-L$(OUTDIR)/lib' \ $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ diff --git a/cairo/cairo/cairo-1.10.2.patch b/cairo/cairo/cairo-1.10.2.patch index 0b63705007ae..c3f7aa745149 100644 --- a/cairo/cairo/cairo-1.10.2.patch +++ b/cairo/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 -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 ++DEFAULT_CFLAGS += -DDISABLE_SOME_FLOATING_POINT=1 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) @@ -198,20 +198,6 @@ cairo_cc_flag=yes else cairo_cc_stderr=`test -f conftest.err && cat conftest.err` ---- 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 @@ @@ -226,34 +212,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 @@ |