diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-20 23:34:21 -0800 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-21 09:51:18 +0100 |
| commit | b5f727d3954e21fd742ad3b2da8f4d77cbd87c1f (patch) | |
| tree | 24e984b95072973bb24ebe5bac342c14de90e59e /cairo | |
| parent | 9945de1a086bfd597971339700645b451ed36e7e (diff) | |
Fix build of generic unix vcl plugin with older fontconfig
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo-1.10.2-oldfontconfig.patch | 11 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/cairo/cairo-1.10.2-oldfontconfig.patch b/cairo/cairo-1.10.2-oldfontconfig.patch new file mode 100644 index 000000000000..d19258aef753 --- /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 1c06c7495a9b..8f2a359205c8 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" |