From 81b59bf46fdc58f772abdb4163e10c3ca7d5b82d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 26 Jul 2012 15:58:22 -0400 Subject: [PATCH] libXt 1.1.3 --- .gitignore | 1 + libXt-1.1.2-git.patch | 40 ---------------------------------------- libXt.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 libXt-1.1.2-git.patch diff --git a/.gitignore b/.gitignore index 66b5e23..9572f00 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.0.tar.bz2 /libXt-1.1.1.tar.bz2 /libXt-1.1.2.tar.bz2 +/libXt-1.1.3.tar.bz2 diff --git a/libXt-1.1.2-git.patch b/libXt-1.1.2-git.patch deleted file mode 100644 index 7ce4663..0000000 --- a/libXt-1.1.2-git.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 75bef5b488245467b6638e25cd22006b306e8536 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -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 f271ac8..e311bbb 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,13 +1,12 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.3 +Release: 1%{?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) @@ -24,7 +23,6 @@ X.Org X11 libXt development package %prep %setup -q -%patch0 -p1 -b .git %build # FIXME: Work around pointer aliasing warnings from compiler for now @@ -95,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 26 2012 Adam Jackson 1.1.3-1 +- libXt 1.1.3 + * Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 06f9d75..aca00d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4f7f149559320f378d93b835d38ad6f libXt-1.1.2.tar.bz2 +a6f137ae100e74ebe3b71eb4a38c40b3 libXt-1.1.3.tar.bz2