Changes 1.12.16:

Bug fixes
* Set the correct orientation for simple boxes with a negative scale factor.
* Fix the creation of the shading dictionary in PDF.
* Fix a crash in PDF when incorporating an image with CAIRO_EXTEND_PAD.
* Avoid upscaling bitmap fonts if possible.
* Fix an assertion failure within the mempool allocator for shared memory.
* Fix allocation size for CFF subsets.
* Export cairo_matrix_t for GObject bindings.
* Fix a double free in the Quartz backend.
* Fix origin of GDI StretchBlits for the Windows backend
* Fix error propagation for requests to create a similar surface with
  negative size.
* Fix complex clipping of trapezoids with regions
* Stop leaking the image data when loading PNGs
* Fix unbounded operations with a clip mask through the span compositor
* Add missing checks before rendering to a finished surface - so we return
  an error rather than hit an assert.
* Prevent an assertion failure when creating similar GL surfaces larger
  than supported by hardware.
* Prevent a double free of a similar image under Windows.

4 files changed, 8 insertions, 76 deletions

diff --git a/graphics/cairo-gobject/DESCR b/graphics/cairo-gobject/DESCR
index 3b5cdef47fa..bf73cea7f72 100644
--- a/graphics/cairo-gobject/DESCR
+++ b/graphics/cairo-gobject/DESCR
@@ -9,7 +9,7 @@ Render Extension).
 
 The cairo API provides operations similar to the drawing operators of
 PostScript and PDF. Operations in cairo including stroking and filling cubic
-Bézier splines, transforming and compositing translucent images, and
+Bezier splines, transforming and compositing translucent images, and
 antialiased text rendering. All drawing operations can be transformed by any
 affine transformation (scale, rotation, shear, etc.)
 
diff --git a/graphics/cairo-gobject/Makefile b/graphics/cairo-gobject/Makefile
index 29b1d19e9ef..f4c7d936880 100644
--- a/graphics/cairo-gobject/Makefile
+++ b/graphics/cairo-gobject/Makefile
@@ -1,58 +1,21 @@
-# $NetBSD: Makefile,v 1.26 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/31 22:19:32 adam Exp $
 
-DISTNAME=	cairo-1.12.14
-PKGNAME=	${DISTNAME:S/-/-gobject-/}
-PKGREVISION=	4
-CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/releases/
-EXTRACT_SUFX=	.tar.xz
+.include "../../graphics/cairo/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cairographics.org/
-COMMENT=	Vector graphics library with cross-device output support
-LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
+PKGNAME=	${DISTNAME:S/-/-gobject-/}
 
-PATCHDIR=	${.CURDIR}/../../graphics/cairo/patches
-DISTINFO_FILE=	${.CURDIR}/../../graphics/cairo/distinfo
 BUILD_DIRS=	util/cairo-gobject
 INSTALL_DIRS=	util/cairo-gobject
 
-USE_LANGUAGES+=		c99
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	src/cairo.pc.in src/cairo-features.pc.in
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-pdf
-CONFIGURE_ARGS+=	--enable-ps
-
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-.include "options.mk"
-
-# For snprintf() and ctime_r()
-CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
-
-# PR#43928
-.include "../../mk/compiler.mk"
-.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
-CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/cairo-gobject.pc \
 		${DESTDIR}${PREFIX}/lib/pkgconfig
 
-.include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.9
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-# include?
-#.include "../../print/libspectre/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo-gobject/buildlink3.mk b/graphics/cairo-gobject/buildlink3.mk
index 0d07770126e..29498595f16 100644
--- a/graphics/cairo-gobject/buildlink3.mk
+++ b/graphics/cairo-gobject/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/08/31 22:19:32 adam Exp $
 
 BUILDLINK_TREE+=	cairo-gobject
 
@@ -9,13 +9,8 @@ BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.10.2
 BUILDLINK_ABI_DEPENDS.cairo-gobject+=	cairo-gobject>=1.12.14nb4
 BUILDLINK_PKGSRCDIR.cairo-gobject?=	../../graphics/cairo-gobject
 
-.include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .endif	# CAIRO_GOBJECT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-cairo-gobject
diff --git a/graphics/cairo-gobject/options.mk b/graphics/cairo-gobject/options.mk
deleted file mode 100644
index a03be2d7d09..00000000000
--- a/graphics/cairo-gobject/options.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/05/05 13:44:23 spz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo-gobject
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		x11
-
-###
-### decide between Quartz, GL or nothing
-###
-.if exists(/System/Library/Frameworks/Carbon.framework)
-CONFIGURE_ARGS+=        --enable-quartz
-CONFIGURE_ARGS+=        --enable-quartz-font
-CONFIGURE_ARGS+=        --enable-quartz-image
-CONFIGURE_ARGS+=        --disable-gl
-CONFIGURE_ARGS+=        --disable-xlib
-CONFIGURE_ARGS+=        --disable-xlib-xrender
-.else
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--enable-gl
-.endif
-.endif
-