[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.10.2.patch

[Fridrich Strba]

 cairo/cairo-1.10.2.patch |   25 +++++++++++++++++++++----
 cairo/cairo/makefile.mk  |    6 +++---
 2 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit 5797fed3a220a48f645150b193d44e90bcc647bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 16 13:31:47 2011 +0100

    Fix cairo build on some older systems

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 6a227e8..c094cd0 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -49,7 +49,7 @@
  CAIRO_HAS_TEE_SURFACE=0
  CAIRO_HAS_XML_SURFACE=0
 --- misc/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
-+++ misc/build/cairo-1.10.2/build/config.sub	2011-12-16 11:53:38.935974163 +0100
++++ misc/build/cairo-1.10.2/build/config.sub	2011-12-16 11:57:32.007884203 +0100
 @@ -1272,7 +1272,7 @@
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -60,8 +60,8 @@
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
-+++ misc/build/cairo-1.10.2/configure	2011-12-16 12:15:47.141406809 +0100
-@@ -19259,61 +19228,11 @@
++++ misc/build/cairo-1.10.2/configure	2011-12-16 13:21:50.143725559 +0100
+@@ -19259,61 +19259,11 @@
  rm -f confcache
  
  
@@ -123,7 +123,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
  $as_echo_n "checking for dlsym in -ldl... " >&6; }
  if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
-@@ -26427,7 +26346,7 @@
+@@ -26427,7 +26367,7 @@
  
    if test "x$png_REQUIRES" = x; then
      # libpng13 is GnuWin32's libpng-1.2.8 :-(
@@ -213,3 +213,20 @@
  #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	2011-12-16 13:22:28.360171103 +0100
+@@ -538,12 +538,12 @@
+ 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+     ret = FcPatternGetString (pattern, FC_FILE, 0, (FcChar8 **) &filename);
+-    if (ret == FcResultOutOfMemory)
++    if (ret == 4 /*FcResultOutOfMemory*/)
+ 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+     if (ret == FcResultMatch) {
+ 	/* If FC_INDEX is not set, we just use 0 */
+ 	ret = FcPatternGetInteger (pattern, FC_INDEX, 0, &id);
+-	if (ret == FcResultOutOfMemory)
++	if (ret == 4 /*FcResultOutOfMemory*/)
+ 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+ 	goto DONE;
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index fcc8e6d..167c704 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -86,7 +86,7 @@ CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/con
 CONFIGURE_FLAGS=--disable-valgrind --disable-xlib --disable-ft --disable-pthread --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 .IF "$(GUI)$(COM)"=="WNTGCC"
 .EXPORT : PWD
 .ENDIF
@@ -119,7 +119,7 @@ cairo_CPPFLAGS+=$(EXTRA_CDEFS)
 cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
 OUT2INC+=src$/cairo-quartz.h
 
@@ -178,7 +178,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
 .IF "$(OS)" == "IOS"
 OUT2INC+=src$/cairo-quartz.h