qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to x11proto 7.0.29

Browse Source
This commit is contained in:
matthieu 2016-08-06 10:58:40 +00:00
parent 42cab04ad2
commit 09ae73e41e
4 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
proto/x11proto/ChangeLog
View File

@ -1,3 +1,51 @@
commit 3e975a39b002070d245d21838f837aaf6e5c41d0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 13 10:28:12 2016 +0200
xproto 7.0.29
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit de30673937e2d36b84cf50c3eb05bbf9836fabfb
Author: James Clarke <jrtc27@jrtc27.com>
Date: Mon Apr 25 17:12:08 2016 +0100
Don't let XFD_SETSIZE exceed FD_SETSIZE
This fixes 2c94cdb453bc641246cc8b9a876da9799bee1ce7 on the Hurd, as
FD_SETSIZE is only 256, and so anyone using XFD_SETSIZE to iterate over
the contents of an fd_set will overrun the array.
Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit edc04f87c74abacb57782dc947f81a2810a72537
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Aug 26 10:11:11 2015 +0200
Raise the number of FD on WIN32 as well
Commit 2c94cdb raised the number of file descriptors from 256 to 512
but only for non-WIN32 platforms.
The definition of XFD_SETSIZE being duplicated, we need to do the same
for WIN32 builds as well otherwise a newer X server trying to
use more than 256 clients would fail on that platform.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 446ee4b7f7ce1bb75f0f6b23bbb33d4bfe8d7ad3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jul 26 08:38:54 2015 -0700
Incorrect guard block in HPkeysym.h
https://bugs.freedesktop.org/show_bug.cgi?id=91469
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 1 11:35:13 2015 -0400

2
proto/x11proto/HPkeysym.h
View File

@ -57,7 +57,7 @@ performance, or use of this material.
#ifndef _HPKEYSYM_H
#define _HPKEYSYM
#define _HPKEYSYM_H
#define hpXK_ClearLine 0x1000FF6F
#define hpXK_InsertLine 0x1000FF70

7
proto/x11proto/Xpoll.h.in
View File

@ -67,11 +67,14 @@ typedef long fd_mask;
# endif
#endif
#if defined(FD_SETSIZE) && FD_SETSIZE < 512
# define XFD_SETSIZE FD_SETSIZE
#else
# define XFD_SETSIZE 512
# ifndef FD_SETSIZE
# define FD_SETSIZE XFD_SETSIZE
# endif
#endif
#ifndef NBBY
#define NBBY 8 /* number of bits in a byte */
@ -165,7 +168,7 @@ typedef struct fd_set {
#else /* WIN32 */
#define XFD_SETSIZE 256
#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
#endif

2
proto/x11proto/configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([Xproto], [7.0.28],
AC_INIT([Xproto], [7.0.29],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])