Changes 1.12.2:

After such a long gestation period for the release of Cairo 1.12, we
inevitably accumulated a few bugs that were flushed out by broadening the
test base. Thanks to everybody who tried the release, apologies to any one
unfortunate enough to encounter a bug and many thanks for reporting it.

4 files changed, 8 insertions, 96 deletions

diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index e33ae9a90bf..57c3e954789 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.14 2010/09/13 12:23:01 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2012/09/07 15:24:03 adam Exp $
 
---- src/Makefile.in.orig	2010-09-06 16:16:41.000000000 +0000
+--- src/Makefile.in.orig	2012-04-29 18:49:55.000000000 +0000
 +++ src/Makefile.in
-@@ -821,9 +821,9 @@ AWK = @AWK@
+@@ -928,9 +928,9 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
  BFD_LIBS = @BFD_LIBS@
  CAIROBOILERPLATE_LIBS = @CAIROBOILERPLATE_LIBS@
- CAIROPERF_LIBS = @CAIROPERF_LIBS@
 -CAIRO_CFLAGS = @CAIRO_CFLAGS@
 +CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
  CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index ffa3cf056ac..ad739c46475 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2011/02/12 13:40:53 drochner Exp $
+$NetBSD: patch-ab,v 1.16 2012/09/07 15:24:03 adam Exp $
 
---- util/cairo-gobject/Makefile.in.orig	2010-12-25 14:22:55.000000000 +0000
+--- util/cairo-gobject/Makefile.in.orig	2012-04-29 18:49:57.000000000 +0000
 +++ util/cairo-gobject/Makefile.in
-@@ -91,7 +91,7 @@ am__base_list = \
+@@ -114,7 +114,7 @@ am__uninstall_files_from_dir = { \
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.15 2011/02/12 13:40:53 drochner Exp $
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am_libcairo_gobject_la_OBJECTS =  \
  	libcairo_gobject_la-cairo-gobject-enums.lo \
-@@ -357,7 +357,7 @@ libcairo_gobject_la_SOURCES = \
+@@ -385,7 +385,7 @@ libcairo_gobject_la_SOURCES = \
  
  libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
  libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
diff --git a/graphics/cairo/patches/patch-src_cairo-quartz-font.c b/graphics/cairo/patches/patch-src_cairo-quartz-font.c
deleted file mode 100644
index b15df878f21..00000000000
--- a/graphics/cairo/patches/patch-src_cairo-quartz-font.c
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-src_cairo-quartz-font.c,v 1.1 2012/06/16 20:52:18 tron Exp $
-
-Fix 32 bit build under Mac OS X Lion. Patch taken from here:
-
-http://cgit.freedesktop.org/cairo/commit/?id=8664df767cb9dbe48647f9853e3dcf551701d3ca
-
---- src/cairo-quartz-font.c.orig	2010-12-25 14:21:34.000000000 +0000
-+++ src/cairo-quartz-font.c	2012-06-16 21:46:19.000000000 +0100
-@@ -90,6 +90,9 @@
- static int (*CGFontGetDescentPtr) (CGFontRef fontRef) = NULL;
- static int (*CGFontGetLeadingPtr) (CGFontRef fontRef) = NULL;
- 
-+/* Not public anymore in 64-bits nor in 10.7 */
-+static ATSFontRef (*FMGetATSFontRefFromFontPtr) (FMFont iFont) = NULL;
-+
- static cairo_bool_t _cairo_quartz_font_symbol_lookup_done = FALSE;
- static cairo_bool_t _cairo_quartz_font_symbols_present = FALSE;
- 
-@@ -127,6 +130,8 @@
-     CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
-     CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
- 
-+    FMGetATSFontRefFromFontPtr = dlsym(RTLD_DEFAULT, "FMGetATSFontRefFromFont");
-+
-     if ((CGFontCreateWithFontNamePtr || CGFontCreateWithNamePtr) &&
- 	CGFontGetGlyphBBoxesPtr &&
- 	CGFontGetGlyphsForUnicharsPtr &&
-@@ -777,7 +782,6 @@
-     return ffont->cgFont;
- }
- 
--#ifndef __LP64__
- /*
-  * compat with old ATSUI backend
-  */
-@@ -798,15 +802,22 @@
- cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id)
- {
--    ATSFontRef atsFont = FMGetATSFontRefFromFont (font_id);
--    CGFontRef cgFont = CGFontCreateWithPlatformFont (&atsFont);
--    cairo_font_face_t *ff;
-+    quartz_font_ensure_symbols();
- 
--    ff = cairo_quartz_font_face_create_for_cgfont (cgFont);
-+    if (FMGetATSFontRefFromFontPtr != NULL) {
-+	ATSFontRef atsFont = FMGetATSFontRefFromFontPtr (font_id);
-+	CGFontRef cgFont = CGFontCreateWithPlatformFont (&atsFont);
-+	cairo_font_face_t *ff;
- 
--    CGFontRelease (cgFont);
-+	ff = cairo_quartz_font_face_create_for_cgfont (cgFont);
-+
-+	CGFontRelease (cgFont);
- 
--    return ff;
-+	return ff;
-+    } else {
-+	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-+	return (cairo_font_face_t *)&_cairo_font_face_nil;
-+    }
- }
- 
- /* This is the old name for the above function, exported for compat purposes */
-@@ -817,4 +828,3 @@
- {
-     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
- }
--#endif
diff --git a/graphics/cairo/patches/patch-src_cairo-quartz.h b/graphics/cairo/patches/patch-src_cairo-quartz.h
deleted file mode 100644
index b6bb0e26db6..00000000000
--- a/graphics/cairo/patches/patch-src_cairo-quartz.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_cairo-quartz.h,v 1.1 2012/06/16 20:52:18 tron Exp $
-
-Fix 32 bit build under Mac OS X Lion. Patch taken from here:
-
-http://cgit.freedesktop.org/cairo/commit/?id=8664df767cb9dbe48647f9853e3dcf551701d3ca
-
---- src/cairo-quartz.h.orig	2010-06-18 12:47:13.000000000 +0100
-+++ src/cairo-quartz.h	2012-06-16 21:46:19.000000000 +0100
-@@ -66,10 +66,8 @@
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
- 
--#ifndef __LP64__
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
--#endif
- 
- #endif /* CAIRO_HAS_QUARTZ_FONT */
-