From e7102a1ad3a0045a6a95fa16a8934566cafa2a48 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 26 Jan 2009 10:28:33 +0000
Subject: [PATCH] - bring a patch from NetBSD via David Coppa to fix a crash
 with cairo gtk themes see GNOME bug #567253

Brad also came up with the same patch and noted the fix is now upstream.
ok jasper@
---
 graphics/cairo/Makefile                       |  3 ++-
 graphics/cairo/patches/patch-src_cairo-clip_c | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 graphics/cairo/patches/patch-src_cairo-clip_c

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 6473572f44e..457e46f1caf 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2009/01/15 10:57:53 eric Exp $
+# $OpenBSD: Makefile,v 1.22 2009/01/26 10:28:33 ajacoutot Exp $
 
 COMMENT=		vector graphics library
 
 DISTNAME=		cairo-1.8.6
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS=		cairo   9.2
 CATEGORIES=		graphics
 
diff --git a/graphics/cairo/patches/patch-src_cairo-clip_c b/graphics/cairo/patches/patch-src_cairo-clip_c
new file mode 100644
index 00000000000..9d061ce054d
--- /dev/null
+++ b/graphics/cairo/patches/patch-src_cairo-clip_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_cairo-clip_c,v 1.1 2009/01/26 10:28:33 ajacoutot Exp $
+
+Fix for http://bugzilla.gnome.org/show_bug.cgi?id=567253
+(crash with cairo gtk theme)
+
+--- src/cairo-clip.c.orig	Mon Jan 26 11:13:05 2009
++++ src/cairo-clip.c	Mon Jan 26 11:14:04 2009
+@@ -423,7 +423,7 @@ _cairo_clip_intersect_mask (cairo_clip_t      *clip,
+     cairo_box_t extents;
+     cairo_rectangle_int_t surface_rect, target_rect;
+     cairo_surface_t *surface = NULL;
+-    cairo_status_t status;
++    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+ 
+     if (clip->all_clipped)
+ 	return CAIRO_STATUS_SUCCESS;