Merge pull request #61 from livecode/peter-b/libcairo-quartz

libcairo: Build fixes for revpdfprinter on iOS 10 and MacOS

Author: peter-b

libcairo/libcairo.gyp

@@ -416,7 +416,7 @@
 							'src/pixman-implementation.c',
 							'src/pixman-linear-gradient.c',
 							'src/pixman-matrix.c',
-							#'src/pixman-mips-dspr2.c',
+							'src/pixman-mips-dspr2.c',
 							'src/pixman-mips.c',
 							'src/pixman-mmx.c',
 							'src/pixman-noop.c',
@@ -427,11 +427,11 @@
 							'src/pixman-region32.c',
 							'src/pixman-solid-fill.c',
 							'src/pixman-sse2.c',
-							#'src/pixman-ssse3.c',
+							'src/pixman-ssse3.c',
 							'src/pixman-timer.c',
 							'src/pixman-trap.c',
 							'src/pixman-utils.c',
-							#'src/pixman-vmx.c',
+							'src/pixman-vmx.c',
 							'src/pixman-x86.c',
 							'src/pixman.c',
 
@@ -447,6 +447,8 @@
 						[
 							['exclude', '^src/cairo-(wgl|tee|egl|gl|directfb|eagle|ft|os2|png|ps|qt|quartz|skia|script|svg|vg|win32|xcb|xlib|xml|cogl|drm).*\\.c(pp)?$'],
 							['exclude', '^src/pixman-(vmx).*\\.c$'],
+							['exclude', '^src/pixman-ssse3\\.c$'],
+							['exclude', '^src/pixman-mips-dspr2\\.c$']
 						],
 
 						# These files don't compile and aren't needed, seemingly

libcairo/src/cairo-features.h

@@ -9,6 +9,9 @@
 #define HAVE_STDINT_H 1
 #define CAIRO_HAS_QUARTZ_SURFACE 1
 #define CAIRO_HAS_QUARTZ_FONT 1
+#define CAIRO_HAS_QUARTZ_APPLICATION_SERVICES 1
+#define CAIRO_HAS_QUARTZ_CORE_GRAPHICS 1
+#define CAIRO_HAS_QUARTZ_ATSUFONTID 1
 #ifdef __BIG_ENDIAN__
 #define WORDS_BIGENDIAN 1
 #define FLOAT_WORDS_BIGENDIAN 1
@@ -22,6 +25,7 @@
 #define HAVE_STDINT_H 1
 #define CAIRO_HAS_QUARTZ_SURFACE 1
 #define CAIRO_HAS_QUARTZ_FONT 1
+#define CAIRO_HAS_QUARTZ_CORE_GRAPHICS 1
 #endif
 
 #ifdef _WINDOWS

libcairo/src/cairo-quartz-font.c

@@ -92,8 +92,10 @@ static int (*CGFontGetAscentPtr) (CGFontRef fontRef) = NULL;
 static int (*CGFontGetDescentPtr) (CGFontRef fontRef) = NULL;
 static int (*CGFontGetLeadingPtr) (CGFontRef fontRef) = NULL;
 
+#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID
 /* Not public anymore in 64-bits nor in 10.7 */
-static ATSFontRef (*FMGetATSFontRefFromFontPtr) (FMFont iFont) = NULL;
+static ATSFontRef (*FMGetATSFontRefFromFontPtr) (ATSUFontID iFont) = NULL;
+#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */
 
 static cairo_bool_t _cairo_quartz_font_symbol_lookup_done = FALSE;
 static cairo_bool_t _cairo_quartz_font_symbols_present = FALSE;
@@ -133,7 +135,9 @@ quartz_font_ensure_symbols(void)
     CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
     CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
 
+#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID
     FMGetATSFontRefFromFontPtr = dlsym(RTLD_DEFAULT, "FMGetATSFontRefFromFont");
+#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */
 
     if ((CGFontCreateWithFontNamePtr || CGFontCreateWithNamePtr) &&
 	CGFontGetGlyphBBoxesPtr &&
@@ -814,6 +818,7 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font)
 /*
  * compat with old ATSUI backend
  */
+#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID
 
 /**
  * cairo_quartz_font_face_create_for_atsu_font_id:
@@ -857,3 +862,5 @@ cairo_atsui_font_face_create_for_atsu_font_id (ATSUFontID font_id)
 {
     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
 }
+
+#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */

libcairo/src/cairo-quartz.h

@@ -40,14 +40,13 @@
 
 #if CAIRO_HAS_QUARTZ_SURFACE
 
-#include <TargetConditionals.h>
+#if CAIRO_HAS_QUARTZ_CORE_GRAPHICS
+#include <CoreGraphics/CoreGraphics.h>
+#include <CoreText/CoreText.h>
+#endif
 
-#if TARGET_OS_IPHONE
-#  include <CoreGraphics/CoreGraphics.h>
-#  include <CoreText/CoreText.h>
-#  define ATSUFontID uint32_t
-#else
-#  include <ApplicationServices/ApplicationServices.h>
+#if CAIRO_HAS_QUARTZ_APPLICATION_SERVICES
+#include <ApplicationServices/ApplicationServices.h>
 #endif
 
 CAIRO_BEGIN_DECLS
@@ -74,8 +73,10 @@ cairo_quartz_surface_get_cg_context (cairo_surface_t *surface);
 cairo_public cairo_font_face_t *
 cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
 
+#if CAIRO_HAS_QUARTZ_ATSUFONTID
 cairo_public cairo_font_face_t *
 cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
+#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */
 
 #endif /* CAIRO_HAS_QUARTZ_FONT */