cairo/cairo-1.8.0.ios.patch

   1 --- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
   2 +++ misc/build/cairo-1.8.0/src/cairo-quartz.h
   3 @@ -40,7 +40,7 @@
   4
   5  #if CAIRO_HAS_QUARTZ_SURFACE
   6
   7 -#include <ApplicationServices/ApplicationServices.h>
   8 +#include <CoreGraphics/CoreGraphics.h>
   9
  10  CAIRO_BEGIN_DECLS
  11
  12 --- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
  13 +++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
  14 @@ -152,10 +152,6 @@
  15      CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
  16      CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
  17
  18 -    if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
  19 -       // assume 10.4
  20 -       _cairo_quartz_osx_version = 0x1040;
  21 -    }
  22
  23      _cairo_quartz_symbol_lookup_done = TRUE;
  24  }
  25 @@ -2093,7 +2093,10 @@
  26         yprev = yf;
  27      }
  28
  29 -    if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
  30 +    if (0) {
  31 +       /* Assume the bug mentioned below is not present in iOS,
  32 +        * until proven otherwise.
  33 +        */
  34         /* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
  35          * bug (apple bug ID #5834794) where the glyph
  36          * advances/positions are not transformed by the text matrix
  37 --- misc/build/cairo-1.8.0.org/configure
  38 +++ misc/build/cairo-1.8.0/configure
  39 @@ -29309,6 +29309,7 @@
  40  quartz_NONPKGCONFIG_LIBS="$ac_env_quartz_NONPKGCONFIG_LIBS_value"
  41
  42
  43 +if false; then
  44      if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
  45    { echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
  46  echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6; }
  47 @@ -29444,6 +29444,7 @@
  48  else
  49    use_quartz="no (requires ApplicationServices framework)"
  50  fi
  51 +fi
  52
  53    if test "x$use_quartz" != "xyes" ; then
  54          if test "${ac_cv_header_CoreGraphics_CoreGraphics_h+set}" = set; then