[Git][xorg-team/lib/libxinerama][upstream-unstable] 6 commits: Remove fallback for _XEatDataWords, require libX11 1.6 for it

[Timo Aaltonen <tjaalton@debian.org>]

Title: GitLab

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libxinerama

Commits:

• edd95182
  by Michael Joost at 2013-11-23T07:15:14Z

  Remove fallback for _XEatDataWords, require libX11 1.6 for it
  
  _XEatDataWords was orignally introduced with the May 2013 security
  patches, and in order to ease the process of delivering those,
  fallback versions of _XEatDataWords were included in the X extension
  library patches so they could be applied to older versions that didn't
  have libX11 1.6 yet.   Now that we're past that hurdle, we can drop
  the fallbacks and just require libX11 1.6 for building new versions
  of the extension libraries.
  
  Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• 1142dd02
  by Tobias Stoeckmann at 2017-01-24T14:39:31Z

  libXinerama: Set number of screens to 0 on error
  
  The documentation of XineramaQueryScreens states that number is always
  set to the amount of screens in the returned array, but if the
  communication with the X server fails, NULL is returned without
  modifying number.
  
  At least dwm relies on the fact that number is set to 0 on error, i.e.
  when NULL is returned. As a NULL pointer contains 0 elements and the
  documentation states that number contains the amount of elements of the
  returned array, I think this should be fixed inside libXinerama.
  
  Reviewed-by: Adam Jackson <ajax@redhat.com>
  

• 7dcef53a
  by Peter Hutterer at 2017-01-26T02:16:04Z

  autogen.sh: use exec instead of waiting for configure to finish
  
  Syncs the invocation of configure with the one from the server.
  
  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
  

• 8760aeca
  by Emil Velikov at 2017-01-26T02:16:04Z

  autogen.sh: use quoted string variables
  
  Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
  fall-outs, when they contain space.
  
  Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  

• 56777107
  by Mihail Konev at 2017-01-26T03:52:49Z

  autogen: add default patch prefix
  
  Signed-off-by: Mihail Konev <k.mvc@ya.ru>
  

• c3ab2361
  by Adam Jackson at 2018-07-05T15:42:49Z

  libXinerama 1.1.4
  
  Signed-off-by: Adam Jackson <ajax@redhat.com>
  

3 changed files:

• autogen.sh
• configure.ac
• src/Xinerama.c

Changes:

autogen.sh

---

1	1	#! /bin/sh
2	2
3		-srcdir=`dirname $0`
	3	+srcdir=`dirname "$0"`
4	4	test -z "$srcdir" && srcdir=.
5	5
6	6	ORIGDIR=`pwd`
7		-cd $srcdir
	7	+cd "$srcdir"
8	8
9	9	autoreconf -v --install || exit 1
10		-cd $ORIGDIR || exit $?
	10	+cd "$ORIGDIR" || exit $?
	11	+
	12	+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
	13	+ git config --local format.subjectPrefix "PATCH libXinerama"
11	14
12	15	if test -z "$NOCONFIGURE"; then
13		- $srcdir/configure "$@"
	16	+ exec "$srcdir"/configure "$@"
14	17	fi

configure.ac

---

...	...	@@ -21,7 +21,7 @@
21	21
22	22	# Initialize Autoconf
23	23	AC_PREREQ([2.60])
24		-AC_INIT([libXinerama], [1.1.3],
	24	+AC_INIT([libXinerama], [1.1.4],
25	25	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXinerama])
26	26	AC_CONFIG_SRCDIR([Makefile.am])
27	27	AC_CONFIG_HEADERS([config.h])
...	...	@@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS
40	40	XORG_CHECK_MALLOC_ZERO
41	41
42	42	# Obtain compiler/linker options for depedencies
43		-PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
44		-
45		-# Check for _XEatDataWords function that may be patched into older Xlib releases
46		-SAVE_LIBS="$LIBS"
47		-LIBS="$XINERAMA_LIBS"
48		-AC_CHECK_FUNCS([_XEatDataWords])
49		-LIBS="$SAVE_LIBS"
	43	+PKG_CHECK_MODULES(XINERAMA, [x11 >= 1.6] xext xextproto [xineramaproto >= 1.1.99.1])
50	44
51	45	# Allow checking code with lint, sparse, etc.
52	46	XORG_WITH_LINT

src/Xinerama.c

---

...	...	@@ -35,20 +35,6 @@ Equipment Corporation.
35	35	#include <X11/extensions/panoramiXproto.h>
36	36	#include <X11/extensions/Xinerama.h>
37	37
38		-#ifndef HAVE__XEATDATAWORDS
39		-#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
40		-#include <limits.h>
41		-
42		-static inline void _XEatDataWords(Display *dpy, unsigned long n)
43		-{
44		-# ifndef LONG64
45		- if (n >= (ULONG_MAX >> 2))
46		- _XIOError(dpy);
47		-# endif
48		- _XEatData (dpy, n << 2);
49		-}
50		-#endif
51		-
52	38	static XExtensionInfo _panoramiX_ext_info_data;
53	39	static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
54	40	static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
...	...	@@ -300,6 +286,7 @@ XineramaQueryScreens(
300	286	if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
301	287	UnlockDisplay (dpy);
302	288	SyncHandle ();
	289	+ *number = 0;
303	290	return NULL;
304	291	}
305	292

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.