Fix building of cairo on windows

3 files changed, 84 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)
  
diff --git a/cairo/cairo-1.10.2.wntmsc.patch b/cairo/cairo-1.10.2.wntmsc.patch
new file mode 100644
index 000000000000..1aa882a03163
--- /dev/null
+++ b/cairo/cairo-1.10.2.wntmsc.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/Makefile.sources	2010-12-25 07:21:34.000000000 -0700
++++ misc/build/cairo-1.10.2/src/Makefile.sources	2011-12-16 08:44:19.209301900 -0700
+@@ -214,7 +214,7 @@
+ cairo_pdf_headers = cairo-pdf.h
+ cairo_pdf_private = cairo-pdf-surface-private.h
+ cairo_pdf_sources = cairo-pdf-surface.c
+-if CAIRO_HAS_PDF_SURFACE
++ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
+@@ -248,7 +248,7 @@
+ 	cairo-xlib-surface-private.h \
+ 	cairo-xlib-xrender-private.h \
+ 	$(NULL)
+-if BUILD_XLIB_XCB
++ifeq ($(BUILD_XLIB_XCB),1)
+ cairo_xlib_sources = cairo-xlib-xcb-surface.c
+ else
+ cairo_xlib_sources = \
+@@ -273,7 +273,7 @@
+ 		    cairo-xcb-surface-core.c \
+ 		    cairo-xcb-surface-render.c \
+ 		    $(NULL)
+-if BUILD_XCB_SHM
++ifeq ($(BUILD_XCB_SHM),1)
+ cairo_xcb_sources += \
+ 		    cairo-xcb-shm.c \
+ 		    cairo-xcb-connection-shm.c \
+@@ -322,7 +322,7 @@
+ 		   cairo-gl-gradient.c \
+ 		   cairo-gl-shaders.c \
+ 		   cairo-gl-surface.c
+-if BUILD_PRIVATE_GLEW
++ifeq ($(BUILD_PRIVATE_GLEW),1)
+ cairo_gl_sources += glew/glew.c
+ endif
+ 
+@@ -373,7 +373,7 @@
+ 
+ cairo_script_headers = cairo-script.h
+ cairo_script_sources = cairo-script-surface.c
+-if CAIRO_HAS_SCRIPT_SURFACE
++ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
+@@ -383,7 +383,7 @@
+ 
+ cairo_xml_headers = cairo-xml.h
+ cairo_xml_sources = cairo-xml-surface.c
+-if CAIRO_HAS_XML_SURFACE
++ifeq ($(CAIRO_HAS_XML_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 167c70466e2e..9aeecde1e4b8 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -49,6 +49,10 @@ TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
 
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
+.IF "$(OS)$(COM)" == "WNTMSC"
+PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
+.ENDIF
+
 .IF "$(OS)" == "IOS"
 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
 PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch