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.coopersm...@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersm...@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 <a...@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.hutte...@who-t.net>
Reviewed-by: Emil Velikov <emil.veli...@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.veli...@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
- - - - -
56777107 by Mihail Konev at 2017-01-26T03:52:49Z
autogen: add default patch prefix
Signed-off-by: Mihail Konev <k....@ya.ru>
- - - - -
c3ab2361 by Adam Jackson at 2018-07-05T15:42:49Z
libXinerama 1.1.4
Signed-off-by: Adam Jackson <a...@redhat.com>
- - - - -
3 changed files:
- autogen.sh
- configure.ac
- src/Xinerama.c
Changes:
=====================================
autogen.sh
=====================================
@@ -1,14 +1,17 @@
#! /bin/sh
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
+
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+ git config --local format.subjectPrefix "PATCH libXinerama"
if test -z "$NOCONFIGURE"; then
- $srcdir/configure "$@"
+ exec "$srcdir"/configure "$@"
fi
=====================================
configure.ac
=====================================
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXinerama], [1.1.3],
+AC_INIT([libXinerama], [1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXinerama])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
@@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
-
-# Check for _XEatDataWords function that may be patched into older Xlib
releases
-SAVE_LIBS="$LIBS"
-LIBS="$XINERAMA_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(XINERAMA, [x11 >= 1.6] xext xextproto [xineramaproto >=
1.1.99.1])
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
=====================================
src/Xinerama.c
=====================================
@@ -35,20 +35,6 @@ Equipment Corporation.
#include <X11/extensions/panoramiXproto.h>
#include <X11/extensions/Xinerama.h>
-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
-#include <limits.h>
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
- if (n >= (ULONG_MAX >> 2))
- _XIOError(dpy);
-# endif
- _XEatData (dpy, n << 2);
-}
-#endif
-
static XExtensionInfo _panoramiX_ext_info_data;
static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
@@ -300,6 +286,7 @@ XineramaQueryScreens(
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay (dpy);
SyncHandle ();
+ *number = 0;
return NULL;
}
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libxinerama/compare/6e1d1dc328ba8162bba2f4694e7f3c706a1491ff...c3ab2361f13154921df2992f9eacc1ea1b3f946b
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libxinerama/compare/6e1d1dc328ba8162bba2f4694e7f3c706a1491ff...c3ab2361f13154921df2992f9eacc1ea1b3f946b
You're receiving this email because of your account on salsa.debian.org.
