diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-01 03:09:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-01 03:09:53 +0300 |
| commit | 6c5e6ac64126edf70135a0dd0e01e6dd661bcdfe (patch) | |
| tree | eecbad5928775e938702bf5f5958f6d19781fd8a | |
| parent | 7f48a4b480910e1742dc1c6f4aaa7f2107ba74d4 (diff) | |
Move an iOS-specific hunk to the iOS-specific patch file
| -rw-r--r-- | cairo/cairo-1.8.0.ios.patch | 10 | ||||
| -rw-r--r-- | cairo/cairo-1.8.0.patch | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch index 7cabe111ad2f..1f260d3a5ee7 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 6624cf284096..f2ce5b67bfd4 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 |