Hello community,

here is the log from the commit of package libXi for openSUSE:Factory checked 
in at 2014-07-16 16:36:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXi (Old)
 and      /work/SRC/openSUSE:Factory/.libXi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libXi"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libXi/libXi.changes      2013-07-05 
15:05:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libXi.new/libXi.changes 2014-07-16 
16:36:19.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jul 11 09:51:19 UTC 2014 - [email protected]
+
+- Update to version 1.7.3
+  * Two important patches fixing deadlocks when using XIPassiveGrab
+    requests.  You're recommended to updated. Note that we now
+    require libX11 1.6, that's a new dependency over 1.7.2 but it's
+    over a year old by now anyway.
+- added baselibs.conf as source to specfile
+
+-------------------------------------------------------------------

Old:
----
  libXi-1.7.2.tar.bz2

New:
----
  libXi-1.7.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libXi.spec ++++++
--- /var/tmp/diff_new_pack.KvxKTz/_old  2014-07-16 16:36:20.000000000 +0200
+++ /var/tmp/diff_new_pack.KvxKTz/_new  2014-07-16 16:36:20.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package libXi
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           libXi
 %define lname  libXi6
-Version:        1.7.2
+Version:        1.7.3
 Release:        0
 Summary:        X Input Extension library
 License:        MIT
@@ -28,6 +28,7 @@
 #Git-Clone:    git://anongit.freedesktop.org/xorg/lib/libXi
 #Git-Web:      http://cgit.freedesktop.org/xorg/lib/libXi/
 Source:         
http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source1:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #git#BuildRequires:    autoconf >= 2.60, automake, libtool
 BuildRequires:  fdupes

++++++ libXi-1.7.2.tar.bz2 -> libXi-1.7.3.tar.bz2 ++++++
++++ 11077 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/ChangeLog new/libXi-1.7.3/ChangeLog
--- old/libXi-1.7.2/ChangeLog   2013-07-03 03:04:35.000000000 +0200
+++ new/libXi-1.7.3/ChangeLog   2014-07-10 01:00:15.000000000 +0200
@@ -1,3 +1,69 @@
+commit 0250f40fb7c9cb7d542189b9cd37e0ae75309729
+Author: Peter Hutterer <[email protected]>
+Date:   Thu Jul 10 08:58:48 2014 +1000
+
+    libXi 1.7.3
+    
+    Signed-off-by: Peter Hutterer <[email protected]>
+
+commit aa628936c7d81ff5fe2da62964dc543c67ec66f1
+Author: Jasper St. Pierre <[email protected]>
+Date:   Tue Jul 8 17:01:04 2014 -0400
+
+    XIPassiveGrab: Fix completely broken locking in XIGrabTouchBegin
+    
+    _XIPassiveGrabDevice calls LockDisplay as the first thing it does. That
+    means that it expects the display to be unlocked. XIGrabTouchBegin locks
+    the display to check for the XI extension, and then never unlocks it.
+    Effectively, this meant that anybody that called XIGrabTouchBegin after
+    XInitThreads just got a deadlock.
+    
+    Cool.
+    
+    Signed-off-by: Peter Hutterer <[email protected]>
+
+commit eb0c522e0ce5763b6bf181f1236e78ca94f98b7e
+Author: Jasper St. Pierre <[email protected]>
+Date:   Tue Jul 8 17:01:03 2014 -0400
+
+    XIPassiveGrab: Fix display locking inside _XIPassiveGrabDevice for error 
paths
+    
+    The code here before would just leave the display locked on error, which is
+    all sorts of broken.
+    
+    Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 288f3362133a36e2c370eb34caf6b5ed6c0764ca
+Author: Michael Joost <[email protected]>
+Date:   Sat Nov 23 09:51:57 2013 -0800
+
+    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 <[email protected]>
+    Signed-off-by: Alan Coopersmith <[email protected]>
+    Signed-off-by: Peter Hutterer <[email protected]>
+
+commit c4b261d230a8ed7c04a140f65d40af86ea73f2fa
+Author: Keith Packard <[email protected]>
+Date:   Thu Jul 25 11:46:17 2013 -0700
+
+    man: Update XIQueryVersion docs to match new version compatibility 
semantics
+    
+    The X server now allows clients to specify any combination of versions
+    starting with version 2.2, document how that works.
+    
+    Signed-off-by: Keith Packard <[email protected]>
+    Reviewed-by: Peter Hutterer <[email protected]>
+    Signed-off-by: Peter Hutterer <[email protected]>
+
 commit b6553cdb36c1bd7071d3bf0493216c5483325716
 Author: Peter Hutterer <[email protected]>
 Date:   Wed Jul 3 10:28:10 2013 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/INSTALL new/libXi-1.7.3/INSTALL
--- old/libXi-1.7.2/INSTALL     2013-07-03 03:04:35.000000000 +0200
+++ new/libXi-1.7.3/INSTALL     2014-07-10 01:00:14.000000000 +0200
@@ -1,11 +1,13 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,10 +222,15 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +267,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +356,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/configure.ac new/libXi-1.7.3/configure.ac
--- old/libXi-1.7.2/configure.ac        2013-07-03 02:28:01.000000000 +0200
+++ new/libXi-1.7.3/configure.ac        2014-07-10 00:55:22.000000000 +0200
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXi], [1.7.2],
+AC_INIT([libXi], [1.7.3],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h])
@@ -27,16 +27,10 @@
 XORG_CHECK_MALLOC_ZERO
 
 # Obtain compiler/linker options for dependencies
-PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 
7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1])
+PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.6] [xextproto >= 7.0.3] 
[xext >= 1.0.99.1] [inputproto >= 2.2.99.1])
 # CFLAGS only for PointerBarrier typedef
 PKG_CHECK_MODULES(XFIXES, [xfixes >= 5])
 
-# Check for _XEatDataWords function that may be patched into older Xlib 
releases
-SAVE_LIBS="$LIBS"
-LIBS="$XI_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 # Check for xmlto and asciidoc for man page conversion
 # (only needed by people building tarballs)
 if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/man/XIQueryVersion.man new/libXi-1.7.3/man/XIQueryVersion.man
--- old/libXi-1.7.2/man/XIQueryVersion.man      2013-03-09 08:50:06.000000000 
+0100
+++ new/libXi-1.7.3/man/XIQueryVersion.man      2013-08-08 01:50:39.000000000 
+0200
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: xiqueryversion
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 03/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 08/08/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "XIQUERYVERSION" "libmansuffix" "03/09/2013" "\ \&" "\ \&"
+.TH "XIQUERYVERSION" "libmansuffix" "08/08/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -92,10 +92,38 @@
 .RS 4
 .\}
 .nf
-Consecutive calls to XIQueryVersion by the same client always return the
-first returned major\&.minor version\&. If the client requests a version
-lower than the first returned major\&.minor version in a subsequent call, a
-BadValue error occurs\&.
+If the client has previously called XIQueryVersion, then the result
+depends on the previously requested version and the currently
+requested version\&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+If either the previous or current requested versions is less than
+2\&.2, or if the requested major version numbers do not match, then
+consecutive calls to XIQueryVersion by the same client always
+return the first returned major\&.minor version\&. If the client
+requests a version lower than the first returned major\&.minor
+version in a subsequent call, a BadValue error occurs\&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+If all of the requested versions are 2\&.2 or greater, then
+consecutive calls to XIQueryVersion by the same client with the
+same major version will return the requested version, but the server
+will operate according to the highest requested version number or
+the highest supported version, whichever is lower\&.
 .fi
 .if n \{\
 .RE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/man/XIQueryVersion.txt new/libXi-1.7.3/man/XIQueryVersion.txt
--- old/libXi-1.7.2/man/XIQueryVersion.txt      2013-02-19 02:39:40.000000000 
+0100
+++ new/libXi-1.7.3/man/XIQueryVersion.txt      2013-07-26 03:23:26.000000000 
+0200
@@ -42,10 +42,22 @@
    cases major_version_inout and minor_version_inout are set to the 
    server's supported version.
 
-   Consecutive calls to XIQueryVersion by the same client always return the
-   first returned major.minor version. If the client requests a version
-   lower than the first returned major.minor version in a subsequent call, a
-   BadValue error occurs.
+   If the client has previously called XIQueryVersion, then the result
+   depends on the previously requested version and the currently
+   requested version.
+
+   If either the previous or current requested versions is less than
+   2.2, or if the requested major version numbers do not match, then
+   consecutive calls to XIQueryVersion by the same client always
+   return the first returned major.minor version. If the client
+   requests a version lower than the first returned major.minor
+   version in a subsequent call, a BadValue error occurs.
+
+   If all of the requested versions are 2.2 or greater, then
+   consecutive calls to XIQueryVersion by the same client with the
+   same major version will return the requested version, but the server
+   will operate according to the highest requested version number or
+   the highest supported version, whichever is lower.
 
    XIQueryVersion can generate a BadValue error.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/src/XIPassiveGrab.c new/libXi-1.7.3/src/XIPassiveGrab.c
--- old/libXi-1.7.2/src/XIPassiveGrab.c 2013-06-26 22:24:57.000000000 +0200
+++ new/libXi-1.7.3/src/XIPassiveGrab.c 2014-07-10 00:49:37.000000000 +0200
@@ -44,6 +44,7 @@
     xXIPassiveGrabDeviceReply reply;
     xXIGrabModifierInfo *failed_mods;
     int len = 0, i;
+    int ret = -1;
     char *buff;
 
     XExtDisplayInfo *extinfo = XInput_find_display(dpy);
@@ -54,11 +55,11 @@
 
     if (mask->mask_len > INT_MAX - 3 ||
         (mask->mask_len + 3)/4 >= 0xffff)
-        return -1;
+        goto out;
 
     buff = calloc(4, (mask->mask_len + 3)/4);
     if (!buff)
-        return -1;
+        goto out;
 
     GetReq(XIPassiveGrabDevice, req);
     req->reqType = extinfo->codes->major_opcode;
@@ -85,15 +86,11 @@
     free(buff);
 
     if (!_XReply(dpy, (xReply *)&reply, 0, xFalse))
-    {
-       UnlockDisplay(dpy);
-       SyncHandle();
-       return -1;
-    }
+        goto out;
 
     failed_mods = calloc(reply.num_modifiers, sizeof(xXIGrabModifierInfo));
     if (!failed_mods)
-        return -1;
+        goto out;
     _XRead(dpy, (char*)failed_mods, reply.num_modifiers * 
sizeof(xXIGrabModifierInfo));
 
     for (i = 0; i < reply.num_modifiers && i < num_modifiers; i++)
@@ -103,9 +100,12 @@
     }
     free(failed_mods);
 
+    ret = reply.num_modifiers;
+
+ out:
     UnlockDisplay(dpy);
     SyncHandle();
-    return reply.num_modifiers;
+    return ret;
 }
 
 int
@@ -166,6 +166,7 @@
     LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1)
        return -1;
+    UnlockDisplay(dpy);
 
     /* FIXME: allow selection of GrabMode for paired devices? */
     return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeTouchBegin, 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/src/XIint.h new/libXi-1.7.3/src/XIint.h
--- old/libXi-1.7.2/src/XIint.h 2013-05-27 01:14:05.000000000 +0200
+++ new/libXi-1.7.3/src/XIint.h 2013-11-25 01:18:55.000000000 +0100
@@ -83,18 +83,5 @@
     return ret;
 }
 
-#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
 
 #endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libXi-1.7.2/src/config.h.in new/libXi-1.7.3/src/config.h.in
--- old/libXi-1.7.2/src/config.h.in     2013-07-03 03:03:56.000000000 +0200
+++ new/libXi-1.7.3/src/config.h.in     2014-07-10 00:55:28.000000000 +0200
@@ -30,9 +30,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the `_XEatDataWords' function. */
-#undef HAVE__XEATDATAWORDS
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to