summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorbjs <bjs>2008-01-18 03:12:13 +0000
committerbjs <bjs>2008-01-18 03:12:13 +0000
commita7eb3fecb6f112a40af210454c15e283ece48448 (patch)
tree58225875b7e6be5dcb5eb7bffd86fe24b222982a /x11
parent1a23feab68d7ab0a88a19d1ced9a7688306b1301 (diff)
downloadpkgsrc-a7eb3fecb6f112a40af210454c15e283ece48448.tar.gz
A tiny addition to patch-aa: don't use the C++ keyword "xor" in pixman.h.
Bump rev.
Diffstat (limited to 'x11')
-rw-r--r--x11/pixman/Makefile4
-rw-r--r--x11/pixman/distinfo4
-rw-r--r--x11/pixman/patches/patch-aa13
3 files changed, 15 insertions, 6 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index c9d04df504c..8d0c87643c8 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/01/09 04:16:41 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/18 03:12:13 bjs Exp $
#
DISTNAME= pixman-0.9.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index cdf97deb4f3..4cc39ef3d48 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/01/12 21:35:43 tnn Exp $
+$NetBSD: distinfo,v 1.4 2008/01/18 03:12:40 bjs Exp $
SHA1 (pixman-0.9.6.tar.bz2) = 922405d4eaf79af902a71fab141049ca360dc1c8
RMD160 (pixman-0.9.6.tar.bz2) = cdd1fa5272429a95bb5343028bead70d7dde2dec
Size (pixman-0.9.6.tar.bz2) = 278790 bytes
-SHA1 (patch-aa) = 2ebff1def8deb37e378eaa6c4bafd4e71cfcd4a9
+SHA1 (patch-aa) = cd646d6ec515a66247fb9f16d1b46648f4926af1
SHA1 (patch-ab) = 38ebdb75be9fc41e61c0cc594b3a13c6778d2f23
SHA1 (patch-ac) = 8dab9fc8a2c9a38b950f3688d6c5d9f749b41796
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
index 1856da3e8e7..e7fa8483239 100644
--- a/x11/pixman/patches/patch-aa
+++ b/x11/pixman/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/01/18 03:12:41 bjs Exp $
Not only OpenBSD has <inttypes.h>.
---- pixman/pixman.h.orig 2007-10-24 12:30:17.000000000 -0400
+--- pixman/pixman.h.orig 2007-12-17 18:50:58.000000000 -0500
+++ pixman/pixman.h
@@ -75,7 +75,7 @@ SOFTWARE.
#if defined (__SVR4) && defined (__sun)
@@ -13,3 +13,12 @@ Not only OpenBSD has <inttypes.h>.
# include <inttypes.h>
#elif defined (_MSC_VER)
typedef __int8 int8_t;
+@@ -370,7 +370,7 @@ pixman_bool_t pixman_fill (uint32_t *bit
+ int y,
+ int width,
+ int height,
+- uint32_t xor);
++ uint32_t _xor);
+ /*
+ * Images
+ */