summaryrefslogtreecommitdiff
path: root/x11/xproto
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2012-09-05 16:46:55 +0000
committerjperkin <jperkin@pkgsrc.org>2012-09-05 16:46:55 +0000
commit9172887c421e56f39da7478de5751857c503b4be (patch)
tree9137efd8f02584aa3e80a68f991da65e2138a305 /x11/xproto
parent0d7b8588dfa963fef4462d60c2e4a73b1d500c22 (diff)
downloadpkgsrc-9172887c421e56f39da7478de5751857c503b4be.tar.gz
Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=66181 to
fix Solaris build issues. Fixes PR#46586. Bump PKGREVISION.
Diffstat (limited to 'x11/xproto')
-rw-r--r--x11/xproto/Makefile3
-rw-r--r--x11/xproto/distinfo4
-rw-r--r--x11/xproto/patches/patch-ad20
3 files changed, 20 insertions, 7 deletions
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 31f228f4cb0..100d895b5b0 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/06/03 19:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/05 16:46:55 jperkin Exp $
#
DISTNAME= xproto-7.0.23
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index e01f6a1cb28..984cad78adc 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2012/06/03 19:57:33 wiz Exp $
+$NetBSD: distinfo,v 1.19 2012/09/05 16:46:55 jperkin Exp $
SHA1 (xproto-7.0.23.tar.bz2) = 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2
RMD160 (xproto-7.0.23.tar.bz2) = b4077227a012c90cbcab8b6e7a289931b2ee6efb
Size (xproto-7.0.23.tar.bz2) = 290114 bytes
SHA1 (patch-aa) = 22cfcde47f2139c685286e97968bfc0c708e1fea
SHA1 (patch-ab) = 9327483e9a48b8715cd212c84dfa3f9e120bbb7f
-SHA1 (patch-ad) = e3b9accae71161c7ba9de8527b18e1c0dcdc1e6a
+SHA1 (patch-ad) = 42a1f0523738ff125d8abf420c4449eac39fed1c
SHA1 (patch-configure) = 9656a03001a26a8853dc21a37c8b3ae25a8562ad
diff --git a/x11/xproto/patches/patch-ad b/x11/xproto/patches/patch-ad
index 84be9618dab..858dccd9a1e 100644
--- a/x11/xproto/patches/patch-ad
+++ b/x11/xproto/patches/patch-ad
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2012/06/03 19:57:33 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2012/09/05 16:46:55 jperkin Exp $
---- Xfuncproto.h.in.orig 2012-03-16 06:11:44.000000000 +0000
-+++ Xfuncproto.h.in
-@@ -83,7 +83,7 @@ in this Software without prior written a
+Patch from https://bugs.freedesktop.org/attachment.cgi?id=66181
+
+--- Xfuncproto.h.in.orig Fri Mar 16 06:11:44 2012
++++ Xfuncproto.h.in Wed Sep 5 15:10:40 2012
+@@ -83,7 +83,7 @@
#endif /* GNUC >= 4 */
/* Added in X11R6.9, so available in any version of modular xproto */
@@ -11,3 +13,13 @@ $NetBSD: patch-ad,v 1.3 2012/06/03 19:57:33 wiz Exp $
# define _X_EXPORT __attribute__((visibility("default")))
# define _X_HIDDEN __attribute__((visibility("hidden")))
# define _X_INTERNAL __attribute__((visibility("internal")))
+@@ -161,7 +161,8 @@
+ /* requires xproto >= 7.0.21 */
+ #ifndef _X_RESTRICT_KYWD
+ # if defined(restrict) /* assume autoconf set it correctly */ || \
+- (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */
++ (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
++ && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
+ # define _X_RESTRICT_KYWD restrict
+ # elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
+ # define _X_RESTRICT_KYWD __restrict__