update to 1.4.2

This switches to the new stable branch. Too many changes to list here,
see the changelog.
Most notably: speed improvements, PDF output improvement, API additions,
bugfixes.

10 files changed, 37 insertions, 126 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index d09684ae23e..4084d56f8a3 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.53 2007/03/20 15:29:18 drochner Exp $
 
-DISTNAME=	cairo-1.2.6
+DISTNAME=	cairo-1.4.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 6755693ef5c..4787a249d96 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.14 2006/08/10 14:28:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/03/20 15:29:18 drochner Exp $
 ${CARBON}include/cairo/cairo-atsui.h
+include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-glitz.h
@@ -64,6 +65,7 @@ share/gtk-doc/html/cairo/index.html
 share/gtk-doc/html/cairo/index.sgml
 share/gtk-doc/html/cairo/ix01.html
 share/gtk-doc/html/cairo/ix02.html
+share/gtk-doc/html/cairo/ix03.html
 share/gtk-doc/html/cairo/language-bindings.html
 share/gtk-doc/html/cairo/left.png
 share/gtk-doc/html/cairo/pt01.html
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 42c75583678..730d6cd7fa7 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.30 2007/03/12 11:03:26 rillig Exp $
+$NetBSD: distinfo,v 1.31 2007/03/20 15:29:18 drochner Exp $
 
-SHA1 (cairo-1.2.6.tar.gz) = b86b4017a9abd565ef11c72b7faee9082a04118f
-RMD160 (cairo-1.2.6.tar.gz) = 4469a661b294e342ee77e726c1cefccd4837ae2e
-Size (cairo-1.2.6.tar.gz) = 2973689 bytes
-SHA1 (patch-aa) = 1b8ac1d495214c80b2e0ba28490bbc212f727773
-SHA1 (patch-ab) = 14f3122cea953ad460b96cb2cf2347e5ed007450
-SHA1 (patch-ac) = 5f3e97e89b8353e03ed4bf78c1cfb73765199bf2
-SHA1 (patch-ad) = b4500f17e6769ecd05902b20bb54c07887a6f6fe
-SHA1 (patch-ae) = 9ce7cab8e4f1394efdd516d5f83d2d53edb02064
-SHA1 (patch-af) = 257e2c4e73842e4a2f236765b9dae1c6f355c8b4
-SHA1 (patch-ag) = 8ac5d971f38a5fb58faeacdf5f1a4d6510663eb9
+SHA1 (cairo-1.4.2.tar.gz) = 9e7a323fc7d81d5011044d7eb22db3bf26ff7314
+RMD160 (cairo-1.4.2.tar.gz) = 53ad2e60507e181cb754991c1fe8f8de47f366a3
+Size (cairo-1.4.2.tar.gz) = 3081092 bytes
+SHA1 (patch-aa) = a5bcc788ba51b1943b6f37678437491a46a7b45c
+SHA1 (patch-ab) = 02ab6fef56431729db98691e9ed9c879c625f016
+SHA1 (patch-ae) = 55c4c5992059e96c96ac022028fe9fed811909fa
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index 1b82e6565ed..c068f5f888e 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2006/08/10 13:50:37 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2007/03/20 15:29:18 drochner Exp $
 
---- src/Makefile.in.orig	2006-08-08 23:11:38.000000000 +0000
+--- src/Makefile.in.orig	2007-03-06 09:21:16.000000000 +0000
 +++ src/Makefile.in
-@@ -225,7 +225,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
+@@ -235,7 +235,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
  CAIRO_CAN_TEST_PDF_SURFACE_TRUE = @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@
  CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@
  CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2006/08/10 13:50:37 wiz Exp $
  CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@
  CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@
  CAIRO_HAS_BEOS_SURFACE_FALSE = @CAIRO_HAS_BEOS_SURFACE_FALSE@
-@@ -260,7 +260,7 @@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HA
+@@ -272,7 +272,7 @@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HA
  CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
  CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
  CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index cf1f38135a3..bc3fa54375c 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2006/08/19 10:33:39 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2007/03/20 15:29:18 drochner Exp $
 
---- test/Makefile.in.orig	2006-08-19 00:41:58.000000000 +0000
+--- test/Makefile.in.orig	2007-03-06 09:21:17.000000000 +0000
 +++ test/Makefile.in
-@@ -56,7 +56,7 @@ host_triplet = @host@
- @CAIRO_CAN_TEST_GLITZ_EGL_SURFACE_TRUE@am__append_12 = $(GLITZ_EGL_LIBS)
- @CAIRO_CAN_TEST_GLITZ_GLX_SURFACE_TRUE@am__append_13 = $(GLITZ_GLX_LIBS)
- @CAIRO_CAN_TEST_GLITZ_WGL_SURFACE_TRUE@am__append_14 = $(GLITZ_WGL_LIBS)
--@HAVE_PTHREAD_TRUE@am__append_15 = -lpthread
-+@HAVE_PTHREAD_TRUE@am__append_15 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_16 = pdf2png
- @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_17 = svg2png
+@@ -50,7 +50,7 @@ host_triplet = @host@
+ @CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_6 = xlib-surface
+ @CAIRO_HAS_MULTI_PAGE_SURFACES_TRUE@am__append_7 = multi-page
+ @CAIRO_HAS_PDF_SURFACE_TRUE@@CAIRO_HAS_PS_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_8 = fallback-resolution
+-@HAVE_PTHREAD_TRUE@am__append_9 = -lpthread
++@HAVE_PTHREAD_TRUE@am__append_9 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_10 = pdf2png$(EXEEXT)
+ @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_11 = svg2png$(EXEEXT)
  EXTRA_PROGRAMS = $(am__EXEEXT_9) $(am__EXEEXT_12)
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
deleted file mode 100644
index 1dce48eed59..00000000000
--- a/graphics/cairo/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/11/09 20:57:41 drochner Exp $
-
---- src/cairoint.h.orig	2006-11-02 23:53:40.000000000 +0100
-+++ src/cairoint.h
-@@ -72,7 +72,7 @@
- 
- CAIRO_BEGIN_DECLS
- 
--#if __GNUC__ >= 3 && defined(__ELF__)
-+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
- # define slim_hidden_proto(name)	slim_hidden_proto1(name, slim_hidden_int_name(name))
- # define slim_hidden_def(name)		slim_hidden_def1(name, slim_hidden_int_name(name))
- # define slim_hidden_int_name(name) INT_##name
-@@ -101,7 +101,7 @@ CAIRO_BEGIN_DECLS
- #endif
- 
- /* slim_internal.h */
--#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
- #define cairo_private		__attribute__((__visibility__("hidden")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
- #define cairo_private		__hidden
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
deleted file mode 100644
index 899bb2d1ad1..00000000000
--- a/graphics/cairo/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/11/09 20:57:41 drochner Exp $
-
---- pixman/src/slim_internal.h.orig	2006-11-01 17:48:53.000000000 +0100
-+++ pixman/src/slim_internal.h
-@@ -47,7 +47,7 @@
- /* ??? Not marked with "slim" because that makes it look too much
-    like the function name instead of just an attribute.  */
- 
--#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
- #define pixman_private	__attribute__((__visibility__("hidden")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
- #define pixman_private       __hidden
-@@ -79,7 +79,7 @@
-    the C symbol "EXT_foo", which is renamed to "foo" at the assembly
-    level.  */
- 
--#if __GNUC__ >= 3 && defined(__ELF__)
-+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
- # define slim_hidden_proto(name)	slim_hidden_proto1(name, slim_hidden_int_name(name))
- # define slim_hidden_def(name)		slim_hidden_def1(name, slim_hidden_int_name(name))
- # define slim_hidden_int_name(name) INT_##name
diff --git a/graphics/cairo/patches/patch-ae b/graphics/cairo/patches/patch-ae
index 4dca610eebc..18cdf7d1a79 100644
--- a/graphics/cairo/patches/patch-ae
+++ b/graphics/cairo/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.5 2006/09/29 13:43:41 drochner Exp $
+$NetBSD: patch-ae,v 1.6 2007/03/20 15:29:22 drochner Exp $
 
-Fixes cairo on 8-bit psuedo color and other 8-bit displays.
+Fixes cairo on 8-bit pseudo color and other 8-bit displays.
 See https://bugs.freedesktop.org/show_bug.cgi?id=4945
 
---- src/cairo-xlib-surface.c.orig	2006-08-18 16:20:16.000000000 +0200
+--- src/cairo-xlib-surface.c.orig	2007-03-02 01:04:59.000000000 +0000
 +++ src/cairo-xlib-surface.c
-@@ -81,6 +81,8 @@ _cairo_xlib_surface_show_glyphs (void   
+@@ -82,6 +82,8 @@ _cairo_xlib_surface_show_glyphs (void   
  
  #define CAIRO_ASSUME_PIXMAP	20
  
@@ -14,7 +14,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  struct _cairo_xlib_surface {
      cairo_surface_t base;
  
-@@ -126,6 +128,8 @@ struct _cairo_xlib_surface {
+@@ -127,6 +129,8 @@ struct _cairo_xlib_surface {
      int num_clip_rects;
  
      XRenderPictFormat *xrender_format;
@@ -23,7 +23,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  };
  
  #define CAIRO_SURFACE_RENDER_AT_LEAST(surface, major, minor)	\
-@@ -504,6 +508,82 @@ _swap_ximage_to_native (XImage *ximage)
+@@ -503,6 +507,82 @@ _swap_ximage_to_native (XImage *ximage)
      }
  }
  
@@ -106,7 +106,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  static cairo_status_t
  _get_image_surface (cairo_xlib_surface_t    *surface,
  		    cairo_rectangle_int16_t *interest_rect,
-@@ -657,6 +737,35 @@ _get_image_surface (cairo_xlib_surface_t
+@@ -656,6 +736,35 @@ _get_image_surface (cairo_xlib_surface_t
      }
      else
      {
@@ -142,7 +142,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  	/*
  	 * XXX This can't work.  We must convert the data to one of the
  	 * supported pixman formats.  Pixman needs another function
-@@ -669,6 +778,8 @@ _get_image_surface (cairo_xlib_surface_t
+@@ -668,6 +777,8 @@ _get_image_surface (cairo_xlib_surface_t
  						    ximage->width,
  						    ximage->height,
  						    ximage->bytes_per_line);
@@ -151,7 +151,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  	if (image->base.status)
  	    goto FAIL;
      }
-@@ -743,6 +854,32 @@ _cairo_xlib_surface_ensure_gc (cairo_xli
+@@ -742,6 +853,32 @@ _cairo_xlib_surface_ensure_gc (cairo_xli
      _cairo_xlib_surface_set_gc_clip_rects (surface);
  }
  
@@ -184,7 +184,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
  static cairo_status_t
  _draw_image_surface (cairo_xlib_surface_t   *surface,
  		     cairo_image_surface_t  *image,
-@@ -751,21 +888,54 @@ _draw_image_surface (cairo_xlib_surface_
+@@ -754,21 +891,54 @@ _draw_image_surface (cairo_xlib_surface_
  {
      XImage ximage;
      unsigned int bpp, alpha, red, green, blue;
@@ -242,7 +242,7 @@ See https://bugs.freedesktop.org/show_bug.cgi?id=4945
      ximage.bits_per_pixel = bpp;
      ximage.red_mask = red;
      ximage.green_mask = green;
-@@ -1890,7 +2060,13 @@ _cairo_xlib_surface_create_internal (Dis
+@@ -1899,7 +2069,13 @@ _cairo_xlib_surface_create_internal (Dis
      surface->have_clip_rects = FALSE;
      surface->clip_rects = NULL;
      surface->num_clip_rects = 0;
diff --git a/graphics/cairo/patches/patch-af b/graphics/cairo/patches/patch-af
deleted file mode 100644
index f7ce41918f4..00000000000
--- a/graphics/cairo/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/09/20 12:58:32 joerg Exp $
-
-As cairo-1.0 from pkgsrc was shipped with PS and PDF backend enabled,
-ensure that the ABI is not broken.
-
---- src/cairo-surface.c.orig	2006-09-20 00:06:40.000000000 +0200
-+++ src/cairo-surface.c
-@@ -2116,3 +2116,22 @@ _cairo_surface_copy_pattern_for_destinat
- 
- /*  LocalWords:  rasterized
-  */
-+
-+#undef cairo_ps_surface_set_dpi
-+#undef cairo_pdf_surface_set_dpi
-+
-+void
-+cairo_ps_surface_set_dpi(cairo_surface_t	*surface,
-+			 double		 x_pixels_per_inch,
-+			 double		 y_pixels_per_inch)
-+{
-+	cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
-+}
-+
-+void
-+cairo_pdf_surface_set_dpi(cairo_surface_t	*surface,
-+			 double		 x_pixels_per_inch,
-+			 double		 y_pixels_per_inch)
-+{
-+	cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
-+}
diff --git a/graphics/cairo/patches/patch-ag b/graphics/cairo/patches/patch-ag
deleted file mode 100644
index bb1d06bb445..00000000000
--- a/graphics/cairo/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/11/23 11:33:02 drochner Exp $
-
---- pixman/src/pixman.h.orig	2006-11-23 12:20:18.000000000 +0100
-+++ pixman/src/pixman.h
-@@ -99,7 +99,7 @@ SOFTWARE.
- 
- #include "pixman-remap.h"
- 
--#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__)
- #define pixman_private		__attribute__((__visibility__("hidden")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
- #define pixman_private		__hidden