[pkgsrc/trunk]: pkgsrc/graphics/libpixman Add a patch from the mono project:

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6341e81b954b
branches:  trunk
changeset: 477497:6341e81b954b
user:      recht <recht%pkgsrc.org@localhost>
date:      Sat Jul 03 23:00:36 2004 +0000

description:
Add a patch from the mono project:
avoid derefering NULL pointers

bump PKGREVISION to 1

diffstat:

 graphics/libpixman/Makefile         |   3 ++-
 graphics/libpixman/distinfo         |   3 ++-
 graphics/libpixman/patches/patch-aa |  36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r ad923dc73a96 -r 6341e81b954b graphics/libpixman/Makefile
--- a/graphics/libpixman/Makefile       Sat Jul 03 22:35:30 2004 +0000
+++ b/graphics/libpixman/Makefile       Sat Jul 03 23:00:36 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/27 11:06:56 adam Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/03 23:00:36 recht Exp $
 #
 
 DISTNAME=      libpixman-0.1.1
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/snapshots/
 
diff -r ad923dc73a96 -r 6341e81b954b graphics/libpixman/distinfo
--- a/graphics/libpixman/distinfo       Sat Jul 03 22:35:30 2004 +0000
+++ b/graphics/libpixman/distinfo       Sat Jul 03 23:00:36 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/04/27 11:06:56 adam Exp $
+$NetBSD: distinfo,v 1.3 2004/07/03 23:00:36 recht Exp $
 
 SHA1 (libpixman-0.1.1.tar.gz) = fcd5b1a30ad621f170392add673f880d3707ba82
 Size (libpixman-0.1.1.tar.gz) = 361389 bytes
+SHA1 (patch-aa) = 24f13081e3fe3f4e2128d509e98db67fbe7361ae
diff -r ad923dc73a96 -r 6341e81b954b graphics/libpixman/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libpixman/patches/patch-aa       Sat Jul 03 23:00:36 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2004/07/03 23:00:37 recht Exp $
+
+--- src/icimage.c.orig 2004-04-15 23:10:42.000000000 +0200
++++ src/icimage.c
+@@ -248,10 +248,14 @@ pixman_image_destroyClip (pixman_image_t
+     case CT_NONE:
+       return;
+     case CT_PIXMAP:
+-      pixman_image_destroy (image->clientClip);
++      if (image->clientClip) {
++          pixman_image_destroy (image->clientClip);
++        }
+       break;
+     default:
+-      pixman_region_destroy (image->clientClip);
++      if (image->clientClip) {
++          pixman_region_destroy (image->clientClip);
++        }
+       break;
+     }
+     image->clientClip = NULL;
+@@ -263,8 +267,12 @@ pixman_image_set_clip_region (pixman_ima
+                     pixman_region16_t *region)
+ {
+     pixman_image_destroyClip (image);
+-    image->clientClip = region;
+-    image->clientClipType = CT_REGION;
++    if (region != NULL) {
++        // image->clientClip = region;
++        pixman_region_copy (image->clientClip, region);
++        image->clientClipType = CT_REGION;
++    }
++
+     image->stateChanges |= CPClipMask;
+     return 0;
+ }