x11proto-core: Changes to 'debian-unstable'
ChangeLog | 55 ++++++++++++++++++++++++++++++++++++
XF86keysym.h | 31 +++++---------------
Xfuncproto.h.in | 31 ++++++++++++++------
Xfuncs.h | 4 +-
Xos.h | 2 -
configure.ac | 2 -
debian/changelog | 8 +++++
debian/control | 1
debian/upstream/signing-key.asc | 60 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 1
10 files changed, 158 insertions(+), 37 deletions(-)
New commits:
commit 28d4aad056f6364e34625c1f283ca1828d5f85e2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:45:27 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5a275ca..a448e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11proto-core (7.0.27-1) UNRELEASED; urgency=medium
+x11proto-core (7.0.27-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
* Remove Cyril from Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:35:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:45:15 +0200
x11proto-core (7.0.26-1) unstable; urgency=medium
commit 265704c8cf53cd560d1066be75c745a6033959cd
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:39:05 2015 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 4423d49..5a275ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-core (7.0.27-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:35:21 +0200
diff --git a/debian/control b/debian/control
index 90ecff9..952bad4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: x11proto-core
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit d2783e446aa1590d6e06bc0e5b945c2ef9a93dd2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:35:39 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 7aead74..191a529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+commit 303b137a55bb2d092b008439570a323c89a41d70
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Dec 30 21:15:09 2014 -0800
+
+ xproto 7.0.27
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ffd4a13042d24cb5c913207585191801a9a1603e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jul 18 17:08:25 2014 -0700
+
+ Use clang's __has_attribute to check for attribute support
+
+ Hopefully other compilers will start adopting this so we don't have to
+ maintain ever growing matrixes of compiler/version checks for all the
+ attributes we use.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 9b895b428576c4d6b4d43c77940c44604f9c1a2c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 15 13:51:02 2014 -0700
+
+ Do not suggest adding new keysyms to XF86keysym.h
+
+ As noted in the comment in the file, X.Org controls the main X11 keysym
+ definitions, so adds new keysyms there, not in the XFree86 vendor space.
+
+ Reported-by: Gioele Barabucci <gioele@svario.it>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 25f1134b4a2bd8018f153158cfc7c9ae255b5d6e
+Author: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+Date: Wed Jun 25 18:08:22 2014 +0200
+
+ Bug #80528: make it build on AIX
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=80528
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 068fd2cb19b6c0434f63b427158506e2ec3c6206
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 9 19:23:58 2014 -0700
+
+ Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
+
+ Support for this attribute is added in the 12.4 beta release.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 03cbbf6c3e811c026c86e3a60d2f9af56606e155
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 14 15:36:00 2014 +0200
diff --git a/debian/changelog b/debian/changelog
index 91b78d4..4423d49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-x11proto-core (7.0.26-2) UNRELEASED; urgency=medium
+x11proto-core (7.0.27-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
+ * New upstream release.
- -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:34:45 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:35:21 +0200
x11proto-core (7.0.26-1) unstable; urgency=medium
commit 35186c689de00414c06b19eae9979d97648b0e83
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 26 15:35:02 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index fe4567f..91b78d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.26-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 15:34:45 +0200
+
x11proto-core (7.0.26-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..863981f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,60 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP
+cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO
+6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY
+eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS
+Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+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
+=tc6G
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 7c688c8..4f66143 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/proto/xproto
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/proto/ xproto-(.*)\.tar\.gz
commit 303b137a55bb2d092b008439570a323c89a41d70
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 30 21:15:09 2014 -0800
xproto 7.0.27
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 355fd0b..1709862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.26],
+AC_INIT([Xproto], [7.0.27],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit ffd4a13042d24cb5c913207585191801a9a1603e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 18 17:08:25 2014 -0700
Use clang's __has_attribute to check for attribute support
Hopefully other compilers will start adopting this so we don't have to
maintain ever growing matrixes of compiler/version checks for all the
attributes we use.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index 608728f..e9e5e71 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -75,15 +75,21 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif /* _XFUNCPROTOBEGIN */
+/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
+#ifndef __has_attribute
+# define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */
+#endif
+
/* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4))
# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
#else
# define _X_SENTINEL(x)
#endif /* GNUC >= 4 */
/* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if (__has_attribute(visibility) || (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")))
@@ -109,14 +115,16 @@ in this Software without prior written authorization from The Open Group.
/* Bulk branch prediction hints via marking error path functions as "cold" */
/* requires xproto >= 7.0.25 */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403) /* 4.3+ */
+#if __has_attribute(__cold__) || \
+ (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */
# define _X_COLD __attribute__((__cold__))
#else
# define _X_COLD /* nothing */
#endif
/* Added in X11R6.9, so available in any version of modular xproto */
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
+#if __has_attribute(deprecated) \
+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
# define _X_DEPRECATED __attribute__((deprecated))
#else /* not gcc >= 3.1 */
@@ -124,15 +132,17 @@ in this Software without prior written authorization from The Open Group.
#endif
/* requires xproto >= 7.0.17 */
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
- || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#if __has_attribute(noreturn) \
+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define _X_NORETURN __attribute((noreturn))
#else
# define _X_NORETURN
#endif /* GNUC */
/* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
+#if __has_attribute(__format__) \
+ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
#else /* not gcc >= 2.3 */
# define _X_ATTRIBUTE_PRINTF(x,y)
@@ -141,14 +151,16 @@ in this Software without prior written authorization from The Open Group.
/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
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)
+#if __has_attribute(nonnull) \
+ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
#define _X_NONNULL(...) /* */
#endif
/* requires xproto >= 7.0.22 */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
+#if __has_attribute(__unused__) \
+ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
#define _X_UNUSED __attribute__((__unused__))
#else
#define _X_UNUSED /* */
commit 9b895b428576c4d6b4d43c77940c44604f9c1a2c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jul 15 13:51:02 2014 -0700
Do not suggest adding new keysyms to XF86keysym.h
As noted in the comment in the file, X.Org controls the main X11 keysym
definitions, so adds new keysyms there, not in the XFree86 vendor space.
Reported-by: Gioele Barabucci <gioele@svario.it>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/XF86keysym.h b/XF86keysym.h
index 93eb062..8b5646e 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -3,29 +3,6 @@
*
* The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
*
- * When adding new entries, the xc/lib/XKeysymDB file should also be
- * updated to make the new entries visible to Xlib.
- */
-
-/*
- * ModeLock
- *
- * This one is old, and not really used any more since XKB offers this
- * functionality.
- */
-
-#define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */
-
-/*
- * Note, 0x1008FF07 - 0x1008FF0F are free and should be used for misc new
- * keysyms that don't fit into any of the groups below.
- *
- * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
- * and should be used first for new keysyms.
- *
- * Check in keysymdef.h for generic symbols before adding new XFree86-specific
- * symbols here.
- *
* X.Org will not be adding to the XF86 set of keysyms, though they have
* been adopted and are considered a "standard" part of X keysym definitions.
* XFree86 never properly commented these keysyms, so we have done our
@@ -36,6 +13,14 @@
* these archives, these are from memory and usage.
*/
+/*
+ * ModeLock
+ *
+ * This one is old, and not really used any more since XKB offers this
+ * functionality.
+ */
+
+#define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */
/* Backlight controls. */
#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */
commit 25f1134b4a2bd8018f153158cfc7c9ae255b5d6e
Author: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
Date: Wed Jun 25 18:08:22 2014 +0200
Bug #80528: make it build on AIX
https://bugs.freedesktop.org/show_bug.cgi?id=80528
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Xfuncs.h b/Xfuncs.h
index 2bcf991..469bb48 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -37,14 +37,14 @@ void bcopy();
void bzero();
int bcmp();
# else
-# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
+# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__) && !defined(_AIX)
# include <memory.h>
void bcopy();
# define bzero(b,len) memset(b, 0, len)
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
# else
# include <string.h>
-# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__)
+# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX)
# include <strings.h>
# endif
# define _XFUNCS_H_INCLUDED_STRING_H
diff --git a/Xos.h b/Xos.h
index 044d22b..7e53946 100644
--- a/Xos.h
+++ b/Xos.h
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
*/
# include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX)
# include <strings.h>
# else
# ifndef index
commit 068fd2cb19b6c0434f63b427158506e2ec3c6206
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 9 19:23:58 2014 -0700
Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
Support for this attribute is added in the 12.4 beta release.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index dac9229..608728f 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -116,7 +116,8 @@ in this Software without prior written authorization from The Open Group.
#endif
/* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
+#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
# define _X_DEPRECATED __attribute__((deprecated))
#else /* not gcc >= 3.1 */
# define _X_DEPRECATED
Reply to: