Update to libXt 1.1.3

4 files changed, 32 insertions, 26 deletions

diff --git a/lib/libXt/ChangeLog b/lib/libXt/ChangeLog
index 1744ee35c..cf0ab3d9d 100644
--- a/lib/libXt/ChangeLog
+++ b/lib/libXt/ChangeLog
@@ -1,3 +1,23 @@
+commit 2d689ac861085d1d74bcbd05d1595bac0bf67d20
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Mar 15 22:51:45 2012 -0700
+
+    libXt 1.1.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 75bef5b488245467b6638e25cd22006b306e8536
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Mon Mar 12 18:36:52 2012 -0700
+
+    Revert "Treat unexpected returned events from poll as errors"
+    
+    This commit caused regressions:
+    https://bugs.freedesktop.org/show_bug.cgi?id=47203
+    https://bugs.freedesktop.org/show_bug.cgi?id=47216
+    
+    This reverts commit 70bb9e28d37fff4ead4d0a2c672af77059765fa4.
+
 commit 8ab1833a80a18131d897f6d9965545c16acef921
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Mar 7 17:57:26 2012 -0800
diff --git a/lib/libXt/configure b/lib/libXt/configure
index 6b06f60c6..542dc1b8e 100644
--- a/lib/libXt/configure
+++ b/lib/libXt/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libXt 1.1.2.
+# Generated by GNU Autoconf 2.62 for libXt 1.1.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -676,8 +676,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXt'
 PACKAGE_TARNAME='libXt'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='libXt 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='libXt 1.1.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXt 1.1.2 to adapt to many kinds of systems.
+\`configure' configures libXt 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1556,7 +1556,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXt 1.1.2:";;
+     short | recursive ) echo "Configuration of libXt 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1694,7 +1694,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXt configure 1.1.2
+libXt configure 1.1.3
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1708,7 +1708,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXt $as_me 1.1.2, which was
+It was created by libXt $as_me 1.1.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2363,7 +2363,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXt'
- VERSION='1.1.2'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24651,7 +24651,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXt $as_me 1.1.2, which was
+This file was extended by libXt $as_me 1.1.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24704,7 +24704,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libXt config.status 1.1.2
+libXt config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libXt/configure.ac b/lib/libXt/configure.ac
index a8901fd86..d15b32699 100644
--- a/lib/libXt/configure.ac
+++ b/lib/libXt/configure.ac
@@ -22,7 +22,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXt], [1.1.2],
+AC_INIT([libXt], [1.1.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/lib/libXt/src/NextEvent.c b/lib/libXt/src/NextEvent.c
index c8c9dd526..b1f7bc7e5 100644
--- a/lib/libXt/src/NextEvent.c
+++ b/lib/libXt/src/NextEvent.c
@@ -356,21 +356,7 @@ static int IoWait (
     return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
 		   wt->wait_time_ptr);
 #else
-    int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-    /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
-     * it as if it failed. */
-    if(ret >= 0) {
-        nfds_t i;
-        for (i=0; i < wf->fdlistlen; i++) {
-            struct pollfd *fd = &wf->fdlist[i];
-            if (fd->revents & ~fd->events) {
-                ret = -1;
-                errno = EIO;
-                break;
-            }
-        }
-    }
-    return ret;
+    return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
 #endif
 }