Split out the iOS-specific patch to fix build with old MacOSX SDK

3 files changed, 68 insertions, 64 deletions

diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch
new file mode 100644
index 000000000000..7cabe111ad2f
--- /dev/null
+++ b/cairo/cairo-1.8.0.ios.patch
@@ -0,0 +1,64 @@
+--- 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 @@
+ cairo_public CGContextRef
+ cairo_quartz_surface_get_cg_context (cairo_surface_t *surface);
+ 
++#endif /* CAIRO_HAS_QUARTZ_SURFACE */
++
+ #if CAIRO_HAS_QUARTZ_FONT
+ 
+ /*
+  * Quartz font support
+  */
+ 
++#include <CoreGraphics/CoreGraphics.h>
++
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+ 
++#if 0
++
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
++
++#endif /* 0 */
+ 
+ #endif /* CAIRO_HAS_QUARTZ_FONT */
+ 
+ CAIRO_END_DECLS
+ 
+-#else
+-
+-# error Cairo was not compiled with support for the quartz backend
+-
+-#endif /* CAIRO_HAS_QUARTZ_SURFACE */
+-
+ #endif /* CAIRO_QUARTZ_H */
+--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
++++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
+@@ -39,7 +39,9 @@
+ #include <dlfcn.h>
+ 
+ #include "cairo-quartz.h"
++#if 0
+ #include "cairo-quartz-private.h"
++#endif
+ 
+ /* CreateWithFontName exists in 10.5, but not in 10.4; CreateWithName isn't public in 10.4 */
+ static CGFontRef (*CGFontCreateWithFontNamePtr) (CFStringRef) = NULL;
+@@ -766,6 +766,8 @@
+ }
+ 
+ 
++#if 0
++
+ /*
+  * compat with old ATSUI backend
+  */
+@@ -808,3 +808,5 @@
+ {
+     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
+ }
++
++#endif /* 0 */
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index 70b3c2fd7d49..6624cf284096 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -291,67 +291,3 @@ diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.
      decimal_point_len = strlen (decimal_point);
  
      assert (decimal_point_len != 0);
---- 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 @@
- cairo_public CGContextRef
- cairo_quartz_surface_get_cg_context (cairo_surface_t *surface);
- 
-+#endif /* CAIRO_HAS_QUARTZ_SURFACE */
-+
- #if CAIRO_HAS_QUARTZ_FONT
- 
- /*
-  * Quartz font support
-  */
- 
-+#include <CoreGraphics/CoreGraphics.h>
-+
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
- 
-+#if !TARGET_OS_IPHONE
-+
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
-+
-+#endif /* !TARGET_OS_IPHONE */
- 
- #endif /* CAIRO_HAS_QUARTZ_FONT */
- 
- CAIRO_END_DECLS
- 
--#else
--
--# error Cairo was not compiled with support for the quartz backend
--
--#endif /* CAIRO_HAS_QUARTZ_SURFACE */
--
- #endif /* CAIRO_QUARTZ_H */
---- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
-+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
-@@ -39,7 +39,9 @@
- #include <dlfcn.h>
- 
- #include "cairo-quartz.h"
-+#if !TARGET_OS_IPHONE
- #include "cairo-quartz-private.h"
-+#endif
- 
- /* CreateWithFontName exists in 10.5, but not in 10.4; CreateWithName isn't public in 10.4 */
- static CGFontRef (*CGFontCreateWithFontNamePtr) (CFStringRef) = NULL;
-@@ -766,6 +766,8 @@
- }
- 
- 
-+#if !TARGET_OS_IPHONE
-+
- /*
-  * compat with old ATSUI backend
-  */
-@@ -808,3 +808,5 @@
- {
-     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
- }
-+
-+#endif /* !TARGET_OS_IPHONE */
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 70dfdb069a95..acfa60e3402e 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -49,6 +49,10 @@ TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
 
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
+.IF "$(OS)" == "IOS"
+PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
+.ENDIF
+
 cairo_CFLAGS=$(SOLARINC)
 cairo_LDFLAGS=$(SOLARLIB)