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

[andyrtr at archlinux.org]

    Date: Saturday, December 17, 2011 @ 04:41:15
  Author: andyrtr
Revision: 145130

upgpkg: xorg-server 1.11.3-1

upstream update 1.11.3

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch

------------------------------------------------------------+
 PKGBUILD                                                   |   17 +-----
 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch |   31 -----------
 2 files changed, 5 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-17 09:34:44 UTC (rev 145129)
+++ PKGBUILD	2011-12-17 09:41:15 UTC (rev 145130)
@@ -3,8 +3,8 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.2
-pkgrel=2
+pkgver=1.11.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -14,19 +14,16 @@
         autoconfig-nvidia.patch
         autoconfig-sis.patch
         revert-trapezoids.patch
-        git-fixes.patch
+        #git-fixes.patch
         xserver-1.11.2-record-crasher.patch
-        Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-md5sums=('8796fff441e5435ee36a72579008af24'
+md5sums=('a7194c437963627e1db0dd2d6c1a1984'
          '6c7e87d63ac4b535e19a80c89d0cf091'
          'f8194638ca4872c2b0a67862a70bcebf'
          'f6c84f4936f8e00abdfbd9fb4eda83fb'
-         '6fb42ec979ecd6125b6599f54dc00d14'
          '3f9de4dbfee2da90167192d8ca9eb2b4'
-         '47f9b979fe38043b42ff86eeee6fd0d0'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
          'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
@@ -44,16 +41,12 @@
   patch -Np1 -i "${srcdir}/revert-trapezoids.patch"
 
   # Add post-release patches from 1.11 branch
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
+#  patch -Np1 -i "${srcdir}/git-fixes.patch"
 
   # From Fedora.
   # Upstream URL: http://patchwork.freedesktop.org/patch/7866/
   patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch"
 
-  # From Fedora.
-  # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298
-  patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch"
-
   autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \

Deleted: Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
===================================================================
--- Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch	2011-12-17 09:34:44 UTC (rev 145129)
+++ Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch	2011-12-17 09:41:15 UTC (rev 145130)
@@ -1,31 +0,0 @@
-From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 27 Oct 2011 11:03:39 +1000
-Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake
- devices
-
-They don't have a KeyClassRec, but we must still allow passive grabs on
-them.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Tested-by: Bastien Nocera <hadess at hadess.net>
----
- Xi/exevents.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 053c76f..edf2c39 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-     rc = CheckGrabValues(client, param);
-     if (rc != Success)
-         return rc;
--    if (k == NULL)
-+    if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
- 	return BadMatch;
-     if (grabtype == GRABTYPE_XI)
-     {
--- 
-1.7.7
-