[libXt] libXt-1.1.2-git.patch: Bugfix from git.

[Adam Jackson]

commit a8be3f05bdf67f9a62ba197cab6c2271c71493a0
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 15 17:30:24 2012 -0400

    libXt-1.1.2-git.patch: Bugfix from git.

 libXt-1.1.2-git.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 libXt.spec            |    7 ++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/libXt-1.1.2-git.patch b/libXt-1.1.2-git.patch
new file mode 100644
index 0000000..7ce4663
--- /dev/null
+++ b/libXt-1.1.2-git.patch
@@ -0,0 +1,40 @@
+From 75bef5b488245467b6638e25cd22006b306e8536 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Tue, 13 Mar 2012 01:36:52 +0000
+Subject: 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.
+---
+diff --git a/src/NextEvent.c b/src/NextEvent.c
+index c8c9dd5..b1f7bc7 100644
+--- a/src/NextEvent.c
++++ b/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
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libXt.spec b/libXt.spec
index 691a9f3..c917f80 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -1,12 +1,13 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0:	libXt-1.1.2-git.patch
 
 BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
 
@@ -23,6 +24,7 @@ X.Org X11 libXt development package
 
 %prep
 %setup -q
+%patch0 -p1 -b .git
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Mar 15 2012 Adam Jackson <ajax at redhat.com> 1.1.2-2
+- libXt-1.1.2-git.patch: Bugfix from git.
+
 * Thu Mar 08 2012 Adam Jackson <ajax at redhat.com> 1.1.2-1
 - libXt 1.1.2