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

[Fridrich Strba]

 cairo/cairo-1.10.2-oldfontconfig.patch |   11 +++++++++++
 cairo/cairo/makefile.mk                |    5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit b5f727d3954e21fd742ad3b2da8f4d77cbd87c1f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Feb 20 23:34:21 2012 -0800

    Fix build of generic unix vcl plugin with older fontconfig

diff --git a/cairo/cairo-1.10.2-oldfontconfig.patch b/cairo/cairo-1.10.2-oldfontconfig.patch
new file mode 100644
index 0000000..d19258a
--- /dev/null
+++ b/cairo/cairo-1.10.2-oldfontconfig.patch
@@ -0,0 +1,11 @@
+--- misc/cairo-1.10.2/configure	2012-02-20 23:25:52.000000000 -0800
++++ misc/build/cairo-1.10.2/configure	2012-02-20 11:53:05.000000000 -0800
+@@ -29672,7 +29672,7 @@
+ fi
+ 
+ 
+-FONTCONFIG_MIN_VERSION=2.2.95
++FONTCONFIG_MIN_VERSION=2.2.3
+ 																	# Check whether --enable-fc was given.
+ if test "${enable_fc+set}" = set; then :
+   enableval=$enable_fc; enable_fc=$enableval
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 1c06c74..8f2a359 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -49,7 +49,8 @@ TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
 
 PATCH_FILES=\
     ..$/cairo-1.10.2.patch \
-    ..$/cairo.dlsym.lcdfilter.patch
+    ..$/cairo.dlsym.lcdfilter.patch \
+    ..$/cairo-1.10.2-oldfontconfig.patch
 
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
@@ -189,7 +190,7 @@ CONFIGURE_FLAGS+=--disable-valgrind
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS+=--disable-ft
 .ELSE
-CONFIGURE_FLAGS+=--enable-ft
+CONFIGURE_FLAGS+=--enable-ft --enable-fc
 .ENDIF
 
 .IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"