Bug 287594 - cairo quartz bustage due to 0.4.0 landing.

gfx/cairo/cairo/src/cairo_atsui_font.c

@@ -37,7 +37,6 @@
 #include <math.h>
 #include "cairo-atsui.h"
 #include "cairoint.h"
-#include "cairo-quartz-private.h"
 #include <iconv.h>
 
 typedef struct {
@@ -459,7 +458,6 @@ _cairo_atsui_font_show_glyphs(void *abstract_font,
     cairo_atsui_font_t *font = abstract_font;
     CGContextRef myBitmapContext;
     CGColorSpaceRef colorSpace;
-    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface;
     cairo_image_surface_t *destImageSurface;
     int i;
 

gfx/cairo/cairo/src/cairo_quartz_surface.c

@@ -35,7 +35,19 @@
 
 #include "cairoint.h"
 #include "cairo-quartz.h"
-#include "cairo-quartz-private.h"
+
+typedef struct cairo_quartz_surface {
+    cairo_surface_t base;
+
+    CGContextRef context;
+
+    int width;
+    int height;
+
+    cairo_image_surface_t *image;
+
+    CGImageRef cgImage;
+} cairo_quartz_surface_t;
 
 static void
 ImageDataReleaseFunc(void *info, const void *data, size_t size)

gfx/cairo/quartz.diff

@@ -1,5 +1,5 @@
 --- cairo-0.4.0/configure.in	2005-03-08 19:35:06.000000000 -0600
-+++ cairo/configure.in	2005-03-23 13:07:11.646608569 -0600
++++ cairo/configure.in	2005-03-23 18:36:53.000000000 -0600
 @@ -79,7 +79,7 @@
  
  AC_ARG_ENABLE(quartz,
@@ -10,8 +10,8 @@
  if test "x$use_quartz" = "xyes"; then
    dnl There is no pkgconfig for quartz; lets do a header check
 --- cairo-0.4.0/src/cairo_atsui_font.c	2005-02-22 13:28:48.000000000 -0600
-+++ cairo/src/cairo_atsui_font.c	2005-03-23 13:04:51.979974760 -0600
-@@ -30,778 +30,712 @@
++++ cairo/src/cairo_atsui_font.c	2005-03-24 13:42:48.371421116 -0600
+@@ -30,778 +30,710 @@
   * The Initial Developer of the Original Code is Calum Robinson
   *
   * Contributor(s):
@@ -24,7 +24,6 @@
 -
  #include "cairo-atsui.h"
  #include "cairoint.h"
-+#include "cairo-quartz-private.h"
 +#include <iconv.h>
  
 +typedef struct {
@@ -889,7 +888,6 @@
 +    cairo_atsui_font_t *font = abstract_font;
 +    CGContextRef myBitmapContext;
 +    CGColorSpaceRef colorSpace;
-+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface;
 +    cairo_image_surface_t *destImageSurface;
 +    int i;
 +
@@ -1397,16 +1395,14 @@
 +    return NULL;
 +}
 --- cairo-0.4.0/src/cairo_quartz_surface.c	2005-02-22 13:24:50.000000000 -0600
-+++ cairo/src/cairo_quartz_surface.c	2005-03-23 13:04:57.823662409 -0600
-@@ -35,67 +35,34 @@
- 
++++ cairo/src/cairo_quartz_surface.c	2005-03-24 13:42:53.233334195 -0600
+@@ -36,66 +36,45 @@
  #include "cairoint.h"
  #include "cairo-quartz.h"
-+#include "cairo-quartz-private.h"
  
 -#pragma mark Types
 -
--typedef struct cairo_quartz_surface {
+ typedef struct cairo_quartz_surface {
 -    cairo_surface_t	    base;
 -    
 -    CGContextRef	    context;
@@ -1420,14 +1416,21 @@
 -} cairo_quartz_surface_t;
 -
 -
--
--
--
++    cairo_surface_t base;
+ 
++    CGContextRef context;
+ 
++    int width;
++    int height;
+ 
 -#pragma mark Private functions
 -
 -
--
--
++    cairo_image_surface_t *image;
+ 
++    CGImageRef cgImage;
++} cairo_quartz_surface_t;
+ 
 -void ImageDataReleaseFunc(void *info, const void *data, size_t size)
 +static void
 +ImageDataReleaseFunc(void *info, const void *data, size_t size)
@@ -1479,7 +1482,7 @@
      cairo_set_target_surface(cr, surface);
  
      /* cairo_set_target_surface takes a reference, so we must destroy ours */
-@@ -103,202 +70,201 @@
+@@ -103,202 +82,201 @@
  }
  
  
@@ -1802,7 +1805,7 @@
  {
      return CAIRO_INT_STATUS_UNSUPPORTED;
  }
-@@ -319,8 +285,8 @@
+@@ -319,8 +297,8 @@
  
  
  static cairo_int_status_t
@@ -1813,7 +1816,7 @@
  {
      cairo_quartz_surface_t *surface = abstract_surface;
  
-@@ -328,10 +294,19 @@
+@@ -328,10 +306,19 @@
  }
  
  
@@ -1837,7 +1840,7 @@
  {
      return CAIRO_INT_STATUS_UNSUPPORTED;
  }
-@@ -341,52 +316,41 @@
+@@ -341,52 +328,41 @@
      _cairo_quartz_surface_create_similar,
      _cairo_quartz_surface_destroy,
      _cairo_quartz_surface_pixels_per_inch,