Wed Sep 5 16:46:55 2012 UTC ()
Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=66181 to
fix Solaris build issues.  Fixes PR#46586.

Bump PKGREVISION.


(jperkin)
diff -r1.19 -r1.20 pkgsrc/x11/xproto/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/xproto/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/xproto/patches/patch-ad
cvs diff -r1.19 -r1.20 pkgsrc/x11/xproto/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xproto/Attic/Makefile 2012/06/03 19:57:33 1.19
+++ pkgsrc/x11/xproto/Attic/Makefile 2012/09/05 16:46:55 1.20
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2012/06/03 19:57:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2012/09/05 16:46:55 jperkin Exp $
2# 2#
3 3
4DISTNAME= xproto-7.0.23 4DISTNAME= xproto-7.0.23
 5PKGREVISION= 1
5CATEGORIES= x11 devel 6CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=proto/} 7MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X protocol and ancillary headers from Xorg X11 12COMMENT= X protocol and ancillary headers from Xorg X11
12LICENSE= mit 13LICENSE= mit
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.18 -r1.19 pkgsrc/x11/xproto/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xproto/Attic/distinfo 2012/06/03 19:57:33 1.18
+++ pkgsrc/x11/xproto/Attic/distinfo 2012/09/05 16:46:55 1.19
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.18 2012/06/03 19:57:33 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2012/09/05 16:46:55 jperkin Exp $
2 2
3SHA1 (xproto-7.0.23.tar.bz2) = 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2 3SHA1 (xproto-7.0.23.tar.bz2) = 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2
4RMD160 (xproto-7.0.23.tar.bz2) = b4077227a012c90cbcab8b6e7a289931b2ee6efb 4RMD160 (xproto-7.0.23.tar.bz2) = b4077227a012c90cbcab8b6e7a289931b2ee6efb
5Size (xproto-7.0.23.tar.bz2) = 290114 bytes 5Size (xproto-7.0.23.tar.bz2) = 290114 bytes
6SHA1 (patch-aa) = 22cfcde47f2139c685286e97968bfc0c708e1fea 6SHA1 (patch-aa) = 22cfcde47f2139c685286e97968bfc0c708e1fea
7SHA1 (patch-ab) = 9327483e9a48b8715cd212c84dfa3f9e120bbb7f 7SHA1 (patch-ab) = 9327483e9a48b8715cd212c84dfa3f9e120bbb7f
8SHA1 (patch-ad) = e3b9accae71161c7ba9de8527b18e1c0dcdc1e6a 8SHA1 (patch-ad) = 42a1f0523738ff125d8abf420c4449eac39fed1c
9SHA1 (patch-configure) = 9656a03001a26a8853dc21a37c8b3ae25a8562ad 9SHA1 (patch-configure) = 9656a03001a26a8853dc21a37c8b3ae25a8562ad
cvs diff -r1.3 -r1.4 pkgsrc/x11/xproto/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/xproto/patches/Attic/patch-ad 2012/06/03 19:57:33 1.3
+++ pkgsrc/x11/xproto/patches/Attic/patch-ad 2012/09/05 16:46:55 1.4
@@ -1,13 +1,25 @@ @@ -1,13 +1,25 @@
1$NetBSD: patch-ad,v 1.3 2012/06/03 19:57:33 wiz Exp $ 1$NetBSD: patch-ad,v 1.4 2012/09/05 16:46:55 jperkin Exp $
2 2
3--- Xfuncproto.h.in.orig 2012-03-16 06:11:44.000000000 +0000 3Patch from https://bugs.freedesktop.org/attachment.cgi?id=66181
4+++ Xfuncproto.h.in 4
5@@ -83,7 +83,7 @@ in this Software without prior written a 5--- Xfuncproto.h.in.orig Fri Mar 16 06:11:44 2012
 6+++ Xfuncproto.h.in Wed Sep 5 15:10:40 2012
 7@@ -83,7 +83,7 @@
6 #endif /* GNUC >= 4 */ 8 #endif /* GNUC >= 4 */
7  9
8 /* Added in X11R6.9, so available in any version of modular xproto */ 10 /* Added in X11R6.9, so available in any version of modular xproto */
9-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) 11-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
10+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun) 12+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun)
11 # define _X_EXPORT __attribute__((visibility("default"))) 13 # define _X_EXPORT __attribute__((visibility("default")))
12 # define _X_HIDDEN __attribute__((visibility("hidden"))) 14 # define _X_HIDDEN __attribute__((visibility("hidden")))
13 # define _X_INTERNAL __attribute__((visibility("internal"))) 15 # define _X_INTERNAL __attribute__((visibility("internal")))
 16@@ -161,7 +161,8 @@
 17 /* requires xproto >= 7.0.21 */
 18 #ifndef _X_RESTRICT_KYWD
 19 # if defined(restrict) /* assume autoconf set it correctly */ || \
 20- (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */
 21+ (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
 22+ && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
 23 # define _X_RESTRICT_KYWD restrict
 24 # elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
 25 # define _X_RESTRICT_KYWD __restrict__