summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-07-03 23:00:36 +0000
committerrecht <recht@pkgsrc.org>2004-07-03 23:00:36 +0000
commit67f323d6698ebe7ccd6bccdfc8c111603766d7f6 (patch)
tree423e1e5d5a90c6f4825bfb81a0aea3524d190a9e /graphics
parent31fd57b70673628ecbe658a77444651dcc87d47b (diff)
downloadpkgsrc-67f323d6698ebe7ccd6bccdfc8c111603766d7f6.tar.gz
Add a patch from the mono project:
avoid derefering NULL pointers bump PKGREVISION to 1
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libpixman/Makefile3
-rw-r--r--graphics/libpixman/distinfo3
-rw-r--r--graphics/libpixman/patches/patch-aa36
3 files changed, 40 insertions, 2 deletions
diff --git a/graphics/libpixman/Makefile b/graphics/libpixman/Makefile
index 33ffbaba605..bfa05e623d5 100644
--- a/graphics/libpixman/Makefile
+++ b/graphics/libpixman/Makefile
@@ -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 --git a/graphics/libpixman/distinfo b/graphics/libpixman/distinfo
index 49551a46369..57f1c3b4917 100644
--- a/graphics/libpixman/distinfo
+++ b/graphics/libpixman/distinfo
@@ -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 --git a/graphics/libpixman/patches/patch-aa b/graphics/libpixman/patches/patch-aa
new file mode 100644
index 00000000000..745797ad0de
--- /dev/null
+++ b/graphics/libpixman/patches/patch-aa
@@ -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;
+ }