upgpkg: xorg-server1.12 1.12.4-6

Fix error with catalyst driver

1 files changed, 31 insertions, 0 deletions

diff --git a/bad-impl.patch b/bad-impl.patch
new file mode 100644
index 000000000000..57a865893645
--- /dev/null
+++ b/bad-impl.patch
@@ -0,0 +1,31 @@
+--- xorg-server.orig/Xi/xiselectev.c	2012-05-17 19:09:01.000000000 +0200
++++ xorg-server/Xi/xiselectev.c	2012-12-18 10:29:38.804469850 +0100
+@@ -175,17 +175,24 @@
+                 if (inputMasks)
+                     iclient = inputMasks->inputClients;
+                 for (; iclient; iclient = iclient->next) {
+-                    DeviceIntPtr dummy;
++                    DeviceIntPtr devTest;
++                    DeviceIntRec dummyTest;
+ 
+                     if (CLIENT_ID(iclient->resource) == client->index)
+                         continue;
+ 
+-                    dixLookupDevice(&dummy, evmask->deviceid, serverClient,
++                    if (evmask->deviceid == XIAllDevices ||
++                        evmask->deviceid == XIAllMasterDevices) {
++                        dummyTest.id = evmask->deviceid;
++                        devTest = &dummyTest;
++                    }
++                    else
++                        dixLookupDevice(&devTest, evmask->deviceid, serverClient,
+                                     DixReadAccess);
+-                    if (!dummy)
++                    if (!devTest)
+                         return BadImplementation;       /* this shouldn't happen */
+ 
+-                    if (xi2mask_isset(iclient->xi2mask, dummy, XI_TouchBegin))
++                    if (xi2mask_isset(iclient->xi2mask, devTest, XI_TouchBegin))
+                         return BadAccess;
+                 }
+             }