head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.2 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.5.0.4 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.2 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.4.0.2 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.14 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.12 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.10 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.8 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.6 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.4 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.2 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.1.0.24 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.22 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.20 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.18 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.16 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.6 date 2013.05.16.05.49.54; author richard; state dead; branches; next 1.5; commitid RXgYHxrj8xHvKOPw; 1.5 date 2012.11.16.20.04.48; author joerg; state Exp; branches; next 1.4; 1.4 date 2012.09.05.16.46.55; author jperkin; state Exp; branches; next 1.3; 1.3 date 2012.06.03.19.57.33; author wiz; state Exp; branches; next 1.2; 1.2 date 2010.09.10.20.07.29; author joerg; state Exp; branches; next 1.1; 1.1 date 2008.01.24.20.15.20; author joerg; state Exp; branches; next ; desc @@ 1.6 log @update to xproto-7.0.24 for modular-xorg-server-1.12.4 @ text @$NetBSD: patch-ad,v 1.5 2012/11/16 20:04:48 joerg Exp $ Patch from https://bugs.freedesktop.org/attachment.cgi?id=66181 --- Xfuncproto.h.in.orig 2012-03-16 06:11:44.000000000 +0000 +++ Xfuncproto.h.in @@@@ -83,10 +83,10 @@@@ in this Software without prior written a #endif /* GNUC >= 4 */ /* Added in X11R6.9, so available in any version of modular xproto */ -#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) -# define _X_EXPORT __attribute__((visibility("default"))) -# define _X_HIDDEN __attribute__((visibility("hidden"))) -# define _X_INTERNAL __attribute__((visibility("internal"))) +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun) +# define _X_EXPORT __attribute__((__visibility__("default"))) +# define _X_HIDDEN __attribute__((__visibility__("hidden"))) +# define _X_INTERNAL __attribute__((__visibility__("internal"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) # define _X_EXPORT __global # define _X_HIDDEN __hidden @@@@ -108,7 +108,7 @@@@ in this Software without prior written a /* Added in X11R6.9, so available in any version of modular xproto */ #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301) -# define _X_DEPRECATED __attribute__((deprecated)) +# define _X_DEPRECATED __attribute__((__deprecated__)) #else /* not gcc >= 3.1 */ # define _X_DEPRECATED #endif @@@@ -116,7 +116,7 @@@@ in this Software without prior written a /* requires xproto >= 7.0.17 */ #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) -# define _X_NORETURN __attribute((noreturn)) +# define _X_NORETURN __attribute((__noreturn__)) #else # define _X_NORETURN #endif /* GNUC */ @@@@ -132,7 +132,7 @@@@ in this Software without prior written a argument macros, must be only used inside #ifdef _X_NONNULL guards, as many legacy X clients are compiled in C89 mode still. */ #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) -#define _X_NONNULL(args...) __attribute__((nonnull(args))) +#define _X_NONNULL(args...) __attribute__((__nonnull(args__))) #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ #define _X_NONNULL(...) /* */ #endif @@@@ -161,7 +161,8 @@@@ in this Software without prior written a /* 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__ @ 1.5 log @Use attributes from the implementation namespace. Applications might be redefining them otherwise and creating conflicts. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2012/09/05 16:46:55 jperkin Exp $ @ 1.4 log @Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=66181 to fix Solaris build issues. Fixes PR#46586. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2012/06/03 19:57:33 wiz Exp $ d5 3 a7 3 --- 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 @@@@ d12 3 d16 34 a49 4 # define _X_EXPORT __attribute__((visibility("default"))) # define _X_HIDDEN __attribute__((visibility("hidden"))) # define _X_INTERNAL __attribute__((visibility("internal"))) @@@@ -161,7 +161,8 @@@@ @ 1.3 log @Update to 7.0.23, based on Makoto Fujiwara's update to 7.0.23 in PR 45465. I've reduced the patch to configure further. 7.0.23: This release continues our documentation improvements, defines new keysyms needed for input of various langugages, and fixes a couple compliation errors in software that includes these headers when building either in C89 mode (without C99 varargs macros) or in the Cygwin environment. 7.0.22: This release provides a number of documentation improvements, a few new macros and new keysyms. 7.0.21: This release contains the addition of Sinhala Unicode keysysm and a couple of compiler fixes and additions. 7.0.20: This release provides two code changes - an additional #include on Solaris machines to fix build issues in the X server, and the addition of new XF86XK_TouchpadOn & XF86XK_TouchpadOff keysyms to the keysym definition headers. It also now includes the definitions of the ServerInterpreted families of addresses that have been registered for use with the xhost +si:* syntax, that were previously found in the xorg-docs module, since the X11 Protocol spec defines the ServerInterpreted method and provides for those definitions. The rest of the changes are further refinements of the DocBook/XML conversion of the protocol spec which was introduced in xproto 7.0.19. The HTML & PDF versions should both feature greatly improved internal hyperlinking to allow easier navigation and following of references between the interconnected requests and events in the spec. The conversion of the documentation is a work in progress, and we appreciate all proof-reading to find errors (this release fixes a couple spots where nroff markup didn't get properly converted and appeared in the resulting text) as well as feedback on formatting or other changes that would make the documentation more useful to developers. Of course, we are being very careful to not change the actual formal specification of the protocol in these changes, just the formatting and usability. 7.0.19: No code nor headers were changed in this release - this solely consists of the move of the X11 Protocol specification from xorg-docs to this module, and it's conversion from troff to DocBook XML by Matt Dew (with some followup markup massaging by yours truly). There is of course still room for improvement as there are over a hundred pages to be proofread - patches accepted if you see ways to make the output better. The standard xorg-macros options are provided in configure to control the generation of text, html, postscript, and/or pdf versions of the documents from the XML sources, via the xmlto frontend and it's associated backends such as fop. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 3 --- 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 d16 10 @ 1.2 log @Update to xproto-7.0.18: - support for noreturn on SunPro 5.9 and later - Add _X_NORETURN macro - disable visibility attributes on Cygwin - Add XF86XK_TouchpadToogle @ text @d3 1 a3 1 --- Xfuncproto.h.in.orig 2010-08-10 14:18:54.000000000 +0000 a5 1 # define _X_ATTRIBUTE_PRINTF(x,y) d8 1 d10 1 a10 1 +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun__) @ 1.1 log @Disable visibility code on Solaris, even when compiling with GCC 4. From Gilles Dauphin in PR 37634. @ text @d3 1 a3 1 --- Xfuncproto.h.in.orig 2008-01-24 21:05:17.000000000 +0100 d5 1 a5 1 @@@@ -85,7 +85,7 @@@@ in this Software without prior written a d9 2 a10 2 -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__sun__) @