Update to 1.4.12:

Release 1.4.12 (2007-11-26 Carl Worth <cworth@cworth.org>)
==========================================================
This is the sixth update in cairo's stable 1.4 series. It comes five
months after the 1.4.10 release. This fix includes various bug fixes
originally developed during the 1.5.x development and backported to
1.4.

Some of the most significant bug fixes prevent crashes:

  * Avoid overflow when allocating large buffers (Vladimir Vukicevic)

  * Fix crash with cairo_pattern_set_user_data (Carl Worth)

  * Fix broken locking in cairo-ft error path (Chris Wilson)

  * Avoid crash when cleaning up after Render extension (Carl Worth)

  * Avoid crash for zero-sized bitmap glyph (Chris Wilson)

  * Avoid crash with type-1 fonts and ft and atsui enabled (Brian Ewins)

  * Fix many error-handling cases in the Quartz/ATSUI code (Brian Ewins)

  * Eliminate cairo_stroke crash with scaling near zero (Carl Worth)

Other fixes address rendering problems:

  * Fix PDF linear gradients without stops at 0.0 and 1.0 (Adrian Johnson)

  * Fix PDF CFF subsetting to work with Apple Preview (Adrian Johnson)

  * Report proper errors on out-of-memory on win32 (Vladimir Vukicevic)

  * Fix EXTEND_NONE gradients for cairo-quartz (Brian Ewins)

  * Fix odd-number-of-dashes dashing for cairo-quartz (Brian Ewins)

  * Fix erroneous results from cairo_stroke_extents (Carl Worth)

  * Force non-AA text when bitmap strikes are available (Keith Packard)

  * Fix cairo-atsui font metrics (Richard Hult)

And some avoid raising cairo errors for innocent problems:

  * Avoid drawing shutdown for glyph-not-found in font (Behdad Esfahbod)

  * Don't raise an error for creating an empty path (Chris Wilson)

At least one optimization managed to sneak in:

  * Free glyph surfaces after uploading to X server cache (Behdad Esfahbod)

And there are a few very minor fixes, (such as build fixes).

3 files changed, 9 insertions, 7 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 1266753225e..0dde58f3478 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2007/07/06 18:19:43 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2007/11/29 22:13:58 wiz Exp $
 
-DISTNAME=	cairo-1.4.10
+DISTNAME=	cairo-1.4.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 47d2183d65e..e326a0a2d3b 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2007/07/06 18:19:43 drochner Exp $
+$NetBSD: distinfo,v 1.37 2007/11/29 22:13:58 wiz Exp $
 
-SHA1 (cairo-1.4.10.tar.gz) = 8371097e30650ec817b24694367110139627403e
-RMD160 (cairo-1.4.10.tar.gz) = ce1cb025d47ec395577e4f4c6fe5092be85e0cbe
-Size (cairo-1.4.10.tar.gz) = 3216689 bytes
+SHA1 (cairo-1.4.12.tar.gz) = 45d5257e5a0c1524bcc25660a96b2c79d012ad3f
+RMD160 (cairo-1.4.12.tar.gz) = 5ed65d5872c0561f3392e60007898d9360d83d0a
+Size (cairo-1.4.12.tar.gz) = 3276610 bytes
 SHA1 (patch-aa) = 79c04674fde56522e1f09e5896fcef4c6b6a0d36
 SHA1 (patch-ab) = c6b98417270f7165aa3499d92d0ca9c19bdd4318
 SHA1 (patch-ae) = 6d3eea66cbd03007dcdef97b5f5bd033f0b6afcd
diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk
index 47dd5baefeb..348dbca0290 100644
--- a/graphics/cairo/options.mk
+++ b/graphics/cairo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/11/06 09:46:41 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2007/11/29 22:13:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS=	x11
@@ -12,6 +12,8 @@ PKG_SUGGESTED_OPTIONS=	x11
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-xlib --enable-xlib-xrender
 PLIST_SUBST+=		X11=""
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"