From 31b7754eafd313f45d4948673310b1e5b1936b24 Mon Sep 17 00:00:00 2001 From: matthieu Date: Sun, 28 Apr 2013 16:53:26 +0000 Subject: [PATCH] Update to xproto 7.0.24 --- proto/x11proto/ChangeLog | 112 +++++++++++++++++++++++++++++++++ proto/x11proto/XF86keysym.h | 2 + proto/x11proto/Xfuncproto.h.in | 5 +- proto/x11proto/Xmd.h | 4 +- proto/x11proto/Xwindows.h | 39 ++++++++---- proto/x11proto/Xwinsock.h | 14 ++++- proto/x11proto/configure.ac | 7 +-- 7 files changed, 164 insertions(+), 19 deletions(-) diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog index 1b8e2a797..d872b46e9 100644 --- a/proto/x11proto/ChangeLog +++ b/proto/x11proto/ChangeLog @@ -1,3 +1,115 @@ +commit d103af8068fb90494cbd6e1ff950850369bbf95f +Author: Alan Coopersmith +Date: Fri Mar 29 16:20:49 2013 -0700 + + xproto 7.0.24 + + Signed-off-by: Alan Coopersmith + +commit f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580 +Author: Colin Walters +Date: Wed Jan 4 17:37:06 2012 -0500 + + autogen.sh: Implement GNOME Build API + + http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Adam Jackson + +commit 3707c6e71c01758b0ac5b2c29c8600b6ff6b73ee +Author: Adam Jackson +Date: Tue Jan 15 14:01:10 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson + +commit c0dd615fddb6fa487d1a914c6928f3843489725e +Author: Yaakov Selkowitz +Date: Mon Oct 22 02:52:44 2012 -0500 + + Adjust wrapping to work with MinGW-w64 headers + + Adjust wrapping to work with MinGW-w64 as well MinGW.org + headers, which define BOOL in a different way. + Add some more comments on what we doing here. + v2: Make similar changes to Xwinsock.h, used for MinGW but not Cygwin. + + Signed-off-by: Jon TURNEY + Signed-off-by: Yaakov Selkowitz + Reviewed-by: Colin Harrison + +commit c0d697ffddf14117541e7021c3b80b25c4536f6f +Author: Yaakov Selkowitz +Date: Mon Oct 15 02:16:46 2012 -0500 + + Do not use visibility attributes on MinGW + + Signed-off-by: Yaakov Selkowitz + Reviewed-by: Colin Harrison + Tested-by: Colin Harrison + +commit c76d51423d6a6afe4f0c8fc6f863ba97d202184b +Author: Alan Coopersmith +Date: Sun Aug 26 14:36:50 2012 -0700 + + Bug 51009: _X_RESTRICT_KYWD fix for g++ 4.6 & later on Solaris + + g++ 4.6 & later on Solaris set the __STDC_VERSION__ define to indicate + C99 mode to expose C99/Unix03 functions in the system headers, even + though they don't recognize the C99 restrict keyword, as explained in + http://gcc.gnu.org/ml/gcc-patches/2010-05/msg01308.html + + Thus we avoid using the restrict keyword here if __cplusplus is also + defined, falling back to the __GNUC__ case using __restrict__ instead. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=51009 + + Signed-off-by: Alan Coopersmith + Tested-by: Jonathan Perkin + +commit f1b8b4dd5e798b7e91da95eca997ec7236fcbc27 +Author: James M Leddy +Date: Wed May 9 12:45:01 2012 -0700 + + Add XF86XK_AudioMicMute + + Lenovo Thinkpad machines have a microphone mute in addition to the + standard audio output mute. + + Signed-off-by: James M. Leddy + Signed-off-by: James Cloos + +commit a06fa7fc98b66652df8bbc4734b5010d43744373 +Author: Sergei Trofimovich +Date: Tue Dec 20 16:43:44 2011 +0300 + + Xmd.h: Treat __ILP32__ targets as LONG32 ones + + amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4 + + Noticed on build failure of libXmu: + libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c: In function '_XEditresGetStringValues': + libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2198:6: error: duplicate case value + libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2194:6: error: previously used here + + More info about x32: https://sites.google.com/site/x32abi/ + + Signed-off-by: Sergei Trofimovich + Signed-off-by: James Cloos + +commit a6651a8d812d224a9e74205bdefb7081f743af11 +Author: Gaetan Nadon +Date: Tue May 1 16:38:14 2012 -0400 + + config: replace obsolete AC_CONFIG_HEADER with with AC_CONFIG_HEADERS + + The former is an obsolete alias to the latter. + It may get removed in the future. + + Reviewed-by: Alan Coopersmith + Signed-off-by: Gaetan Nadon + commit 20202784b9700d973d5301f0cb3243eba99fc349 Author: Alan Coopersmith Date: Thu Mar 15 23:11:19 2012 -0700 diff --git a/proto/x11proto/XF86keysym.h b/proto/x11proto/XF86keysym.h index df5e9cc7f..93eb06295 100644 --- a/proto/x11proto/XF86keysym.h +++ b/proto/x11proto/XF86keysym.h @@ -210,6 +210,8 @@ #define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */ #define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */ +#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 diff --git a/proto/x11proto/Xfuncproto.h.in b/proto/x11proto/Xfuncproto.h.in index dc913face..8256fecd9 100644 --- a/proto/x11proto/Xfuncproto.h.in +++ b/proto/x11proto/Xfuncproto.h.in @@ -83,7 +83,7 @@ in this Software without prior written authorization from The Open Group. #endif /* GNUC >= 4 */ /* Added in X11R6.9, so available in any version of modular xproto */ -#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__MINGW32__) # define _X_EXPORT __attribute__((visibility("default"))) # define _X_HIDDEN __attribute__((visibility("hidden"))) # define _X_INTERNAL __attribute__((visibility("internal"))) @@ -161,7 +161,8 @@ in this Software without prior written authorization from The Open Group. /* 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__ diff --git a/proto/x11proto/Xmd.h b/proto/x11proto/Xmd.h index f3868b36d..96cc08ffd 100644 --- a/proto/x11proto/Xmd.h +++ b/proto/x11proto/Xmd.h @@ -64,7 +64,9 @@ SOFTWARE. defined(__s390x__) || \ defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) -# define LONG64 /* 32/64-bit architecture */ +# if !defined(__ILP32__) /* amd64-x32 is 32bit */ +# define LONG64 /* 32/64-bit architecture */ +# endif /* !__ILP32__ */ # endif /* diff --git a/proto/x11proto/Xwindows.h b/proto/x11proto/Xwindows.h index 6318155e1..e6be6eef2 100644 --- a/proto/x11proto/Xwindows.h +++ b/proto/x11proto/Xwindows.h @@ -29,28 +29,39 @@ The Open Group. /* * This header file has the sole purpose of allowing the inclusion of * windows.h without getting any name conflicts with X headers code, by - * renaming the conflicting definitions from windows.h - * - * Some (non-Microsoft) versions of the Windows API headers actually avoid + * renaming or disabling the conflicting definitions from windows.h + */ + +/* + * Mingw.org versions of the Windows API headers actually avoid * making the conflicting definitions if XFree86Server is defined, so we * need to remember if that was defined and undefine it during including * windows.h (so the conflicting definitions get wrapped correctly), and - * then redefine it afterwards... - * - * There doesn't seem to be a good way to wrap the min/max macros from - * windows.h, so we simply avoid defining them completely, allowing any - * pre-existing definition to stand. - * + * then redefine it afterwards. (This was never the correct thing to + * do as it's no help at all to X11 clients which also need to use the + * Win32 API) */ - #undef _XFree86Server #ifdef XFree86Server # define _XFree86Server # undef XFree86Server #endif +/* + * There doesn't seem to be a good way to wrap the min/max macros from + * windows.h, so we simply avoid defining them completely, allowing any + * pre-existing definition to stand. + * + */ #define NOMINMAX -#define BOOL wBOOL + +/* + * mingw-w64 headers define BOOL as a typedef, protecting against macros + * mingw.org headers define BOOL in terms of WINBOOL + * ... so try to come up with something which works with both :-) + */ +#define _NO_BOOL_TYPEDEF +#define BOOL WINBOOL #define INT32 wINT32 #undef Status #define Status wStatus @@ -68,6 +79,12 @@ The Open Group. #undef FreeResource #undef CreateWindowA +/* + * Older version of this header used to name the windows API bool type wBOOL, + * rather than more standard name WINBOOL + */ +#define wBOOL WINBOOL + #ifdef RESOURCE_H # undef RT_FONT # undef RT_CURSOR diff --git a/proto/x11proto/Xwinsock.h b/proto/x11proto/Xwinsock.h index e6ca7b54b..a81dd7a25 100644 --- a/proto/x11proto/Xwinsock.h +++ b/proto/x11proto/Xwinsock.h @@ -39,7 +39,13 @@ The Open Group. # undef XFree86Server #endif -#define BOOL wBOOL +/* + * mingw-w64 headers define BOOL as a typedef, protecting against macros + * mingw.org headers define BOOL in terms of WINBOOL + * ... so try to come up with something which works with both :-) + */ +#define _NO_BOOL_TYPEDEF +#define BOOL WINBOOL #define INT32 wINT32 #undef Status #define Status wStatus @@ -58,6 +64,12 @@ The Open Group. #undef RT_FONT #undef RT_CURSOR +/* + * Older version of this header used to name the windows API bool type wBOOL, + * rather than more standard name WINBOOL + */ +#define wBOOL WINBOOL + #ifdef _XFree86Server # define XFree86Server # undef _XFree86Server diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac index 4bd61feb2..0e21f8e9c 100644 --- a/proto/x11proto/configure.ac +++ b/proto/x11proto/configure.ac @@ -1,8 +1,7 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.23], +AC_INIT([Xproto], [7.0.24], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], @@ -15,8 +14,8 @@ XORG_WITH_FOP XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) -AC_CONFIG_HEADER([do-not-use-config.h]) -AC_CONFIG_HEADER([Xfuncproto.h]) +AC_CONFIG_HEADERS([do-not-use-config.h]) +AC_CONFIG_HEADERS([Xfuncproto.h]) AC_CANONICAL_HOST