From 095963d4fed4e19db577c1bb7c006867070a3325 Mon Sep 17 00:00:00 2001
From: recht <recht@pkgsrc.org>
Date: Sat, 3 Jul 2004 23:01:36 +0000
Subject: Add a patch from the mono project: pixman_image_set_clip_region
 expects to take ownership of the passed-in region, so we create a copy to
 give it.

bump PKGREVISION to 1
---
 graphics/cairo/Makefile         |  3 ++-
 graphics/cairo/distinfo         |  3 ++-
 graphics/cairo/patches/patch-aa | 23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 graphics/cairo/patches/patch-aa

(limited to 'graphics/cairo')

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index e7094d9dac2..9637d9dd0a2 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/06/26 20:24:03 recht Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/03 23:01:36 recht Exp $
 
 DISTNAME=	cairo-0.1.23
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 7a54ce1c289..d5947c41d91 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2004/05/11 17:36:25 recht Exp $
+$NetBSD: distinfo,v 1.5 2004/07/03 23:01:36 recht Exp $
 
 SHA1 (cairo-0.1.23.tar.gz) = ed0bea8a6f1382803989c047631f3d6d82c864c3
 Size (cairo-0.1.23.tar.gz) = 393051 bytes
+SHA1 (patch-aa) = 0c9aba36a2c9a114e9b0da08ea0df0bf3f336e52
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
new file mode 100644
index 00000000000..d058e403d33
--- /dev/null
+++ b/graphics/cairo/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2004/07/03 23:01:36 recht Exp $
+
+--- src/cairo_image_surface.c.orig	2004-04-14 03:06:15.000000000 +0200
++++ src/cairo_image_surface.c
+@@ -462,7 +462,17 @@ cairo_int_status_t
+ _cairo_image_surface_set_clip_region (cairo_image_surface_t *surface,
+ 				      pixman_region16_t *region)
+ {
+-    pixman_image_set_clip_region (surface->pixman_image, region);
++    if (region) {
++        pixman_region16_t *rcopy;
++
++        rcopy = pixman_region_create();
++        /* pixman_image_set_clip_region expects to take ownership of the
++         * passed-in region, so we create a copy to give it. */
++        pixman_region_copy (rcopy, region);
++        pixman_image_set_clip_region (surface->pixman_image, rcopy);
++    } else {
++        pixman_image_set_clip_region (surface->pixman_image, region);
++    }
+ 
+     return CAIRO_STATUS_SUCCESS;
+ }
-- 
cgit v1.2.3