[Libreoffice-commits] .: cairo/cairo-1.8.0.ios.patch cairo/cairo-1.8.0.patch
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 30 17:10:04 PDT 2011
cairo/cairo-1.8.0.ios.patch | 10 ++++++++++
cairo/cairo-1.8.0.patch | 8 --------
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 14518d3f23c9d3252f34a4d0c6ba95960ab5b5ae
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jul 1 03:09:53 2011 +0300
Move an iOS-specific hunk to the iOS-specific patch file
diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch
index 7cabe11..1f260d3 100644
--- a/cairo/cairo-1.8.0.ios.patch
+++ b/cairo/cairo-1.8.0.ios.patch
@@ -1,3 +1,13 @@
+--- misc/build/cairo-1.8.0.org/configure
++++ misc/build/cairo-1.8.0/configure
+@@ -29865,7 +29865,6 @@
+ quartz_font_NONPKGCONFIG_LIBS="$ac_env_quartz_font_NONPKGCONFIG_LIBS_value"
+
+
+- use_quartz_font=$use_quartz
+
+ cairo_cv_quartz_font_use=$use_quartz_font
+ cairo_cv_quartz_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
+++ misc/build/cairo-1.8.0/src/cairo-quartz.h
@@ -57,26 +57,28 @@
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index 6624cf2..f2ce5b6 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -197,14 +197,6 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
{ echo "$as_me:$LINENO: checking for X" >&5
-@@ -29865,7 +29865,6 @@
- quartz_font_NONPKGCONFIG_LIBS="$ac_env_quartz_font_NONPKGCONFIG_LIBS_value"
-
-
-- use_quartz_font=$use_quartz
-
- cairo_cv_quartz_font_use=$use_quartz_font
- cairo_cv_quartz_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
@@ -31723,7 +31723,7 @@
if test "x$png_REQUIRES" = x; then
More information about the Libreoffice-commits
mailing list