diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-01 02:55:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-01 02:55:52 +0300 |
| commit | 7f48a4b480910e1742dc1c6f4aaa7f2107ba74d4 (patch) | |
| tree | 38231c1c211660deb6cddd6923792b178504b01f /cairo/cairo-1.8.0.ios.patch | |
| parent | b2320b1e49ee98dcc269fa2cc23655b805e6500e (diff) | |
Split out the iOS-specific patch to fix build with old MacOSX SDK
Diffstat (limited to 'cairo/cairo-1.8.0.ios.patch')
| -rw-r--r-- | cairo/cairo-1.8.0.ios.patch | 64 |
1 files changed, 64 insertions, 0 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 */ |