diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-16 17:31:22 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-16 17:31:36 +0100 |
| commit | 19bd9a8a6dd1cf337447f69d866dfc44a8ec6f53 (patch) | |
| tree | 07749ce0f3eba8b9272b6a92210047d6ece45647 /cairo/cairo-1.10.2.patch | |
| parent | ee23ea13ddb527c0aa2e1739c2b4a3f7dd66c742 (diff) | |
Fix building of cairo on windows
Diffstat (limited to 'cairo/cairo-1.10.2.patch')
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 15c5c452bb5f..533efdfda848 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,14 +1,34 @@ --- 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 2010-08-18 09:47:30.000000000 +0200 -@@ -30,7 +30,7 @@ +@@ -18,7 +18,7 @@ + CAIRO_HAS_DRM_XR_FUNCTIONS=0 + CAIRO_HAS_GALLIUM_SURFACE=0 + CAIRO_HAS_XCB_DRM_FUNCTIONS=0 +-CAIRO_HAS_PNG_FUNCTIONS=1 ++CAIRO_HAS_PNG_FUNCTIONS=0 + CAIRO_HAS_GL_SURFACE=0 + CAIRO_HAS_DIRECTFB_SURFACE=0 + CAIRO_HAS_VG_SURFACE=0 +@@ -28,9 +28,9 @@ + CAIRO_HAS_SCRIPT_SURFACE=0 + CAIRO_HAS_FT_FONT=0 CAIRO_HAS_FC_FONT=0 - CAIRO_HAS_PS_SURFACE=1 - CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_PS_SURFACE=1 +-CAIRO_HAS_PDF_SURFACE=1 ++CAIRO_HAS_PS_SURFACE=0 ++CAIRO_HAS_PDF_SURFACE=0 -CAIRO_HAS_SVG_SURFACE=1 +CAIRO_HAS_SVG_SURFACE=0 CAIRO_HAS_TEST_SURFACES=0 CAIRO_HAS_TEE_SURFACE=0 CAIRO_HAS_XML_SURFACE=0 +@@ -37,5 +37,5 @@ + CAIRO_HAS_PTHREAD=0 + CAIRO_HAS_GOBJECT_FUNCTIONS=0 + CAIRO_HAS_TRACE=0 +-CAIRO_HAS_INTERPRETER=1 ++CAIRO_HAS_INTERPRETER=0 + CAIRO_HAS_SYMBOL_LOOKUP=0 --- 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 2009-06-14 23:53:24.000000000 +0200 @@ -22,8 +22,8 @@ @@ -35,7 +55,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 ++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) |