[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo-1.10.2.patch

[Fridrich Strba]

 cairo/cairo-1.10.2.patch |   34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

New commits:
commit a651ccbc873436238a5c7a134d426e003133c737
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 19 19:03:04 2011 +0100

    Build all default cairo features on Windows
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index cd6b350..6bc44c9 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -1,33 +1,6 @@
---- 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
-@@ -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
-@@ -30,7 +30,7 @@
- CAIRO_HAS_FC_FONT=0
- CAIRO_HAS_PS_SURFACE=1
- CAIRO_HAS_PDF_SURFACE=1
--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 @@
+@@ -22,24 +22,26 @@
  OPT := -MD -O2
  endif
  
@@ -38,7 +11,10 @@
  
  CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
  ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
-@@ -33,13 +33,15 @@
+ LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/
+-CAIRO_LIBS +=  $(top_builddir)/../libpng/libpng.lib
++CAIRO_LIBS += libpng.lib
+ endif
  ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
  else
  ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/