[pkgsrc/trunk]: pkgsrc/x11/pixman A tiny addition to patch-aa: don't use the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17a9a3bf0871
branches:  trunk
changeset: 537851:17a9a3bf0871
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Jan 18 03:12:13 2008 +0000

description:
A tiny addition to patch-aa:  don't use the C++ keyword "xor" in pixman.h.
Bump rev.

diffstat:

 x11/pixman/Makefile         |   4 ++--
 x11/pixman/distinfo         |   4 ++--
 x11/pixman/patches/patch-aa |  13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 3ca0a402b50a -r 17a9a3bf0871 x11/pixman/Makefile
--- a/x11/pixman/Makefile       Fri Jan 18 02:55:04 2008 +0000
+++ b/x11/pixman/Makefile       Fri Jan 18 03:12:13 2008 +0000
@@ -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 -r 3ca0a402b50a -r 17a9a3bf0871 x11/pixman/distinfo
--- a/x11/pixman/distinfo       Fri Jan 18 02:55:04 2008 +0000
+++ b/x11/pixman/distinfo       Fri Jan 18 03:12:13 2008 +0000
@@ -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 -r 3ca0a402b50a -r 17a9a3bf0871 x11/pixman/patches/patch-aa
--- a/x11/pixman/patches/patch-aa       Fri Jan 18 02:55:04 2008 +0000
+++ b/x11/pixman/patches/patch-aa       Fri Jan 18 03:12:13 2008 +0000
@@ -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 @@
  #  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
+  */