[arch-commits] Commit in libxt/trunk (2 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Mar 16 13:08:24 EDT 2012


    Date: Friday, March 16, 2012 @ 13:08:24
  Author: andyrtr
Revision: 153608

upgpkg: libxt 1.1.3-1

upstream update 1.1.3

Modified:
  libxt/trunk/PKGBUILD
Deleted:
  libxt/trunk/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff

------------------------------------------------------------------+
 PKGBUILD                                                         |   12 +--
 Revert_treat_unexpected_returned_events_from_poll_as_errors.diff |   40 ----------
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-16 17:04:23 UTC (rev 153607)
+++ PKGBUILD	2012-03-16 17:08:24 UTC (rev 153608)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libxt
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X11 toolkit intrinsics library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -11,15 +11,11 @@
 depends=('libsm' 'libx11')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2"
-        Revert_treat_unexpected_returned_events_from_poll_as_errors.diff)
-sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf'
-          'bebadf4b90f6a49530b5600a12a9385253e0daa6')
+source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
+sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a')
 
 build() {
   cd "${srcdir}/libXt-${pkgver}"
-  # revert broken commit, see https://bugs.archlinux.org/task/28844 + https://bugs.archlinux.org/task/28875 + https://bugs.freedesktop.org/show_bug.cgi?id=47203
-  patch -Np1 -R -i ${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }

Deleted: Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
===================================================================
--- Revert_treat_unexpected_returned_events_from_poll_as_errors.diff	2012-03-16 17:04:23 UTC (rev 153607)
+++ Revert_treat_unexpected_returned_events_from_poll_as_errors.diff	2012-03-16 17:08:24 UTC (rev 153608)
@@ -1,40 +0,0 @@
-From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 04 Jan 2012 18:33:29 +0000
-Subject: Treat unexpected returned events from poll as errors
-
-Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
-diff --git a/src/NextEvent.c b/src/NextEvent.c
-index b1f7bc7..c8c9dd5 100644
---- a/src/NextEvent.c
-+++ b/src/NextEvent.c
-@@ -356,7 +356,21 @@ static int IoWait (
-     return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
- 		   wt->wait_time_ptr);
- #else
--    return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+    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;
- #endif
- }
- 
---
-cgit v0.9.0.2-2-gbebe



More information about the arch-commits mailing list