- up to 1.6.1.901

Changed files:
    xorg-xserver-server-xinerama-bug20557.patch -> 1.2
    xorg-xserver-server.spec -> 1.186

diff --git a/xorg-xserver-server-xinerama-bug20557.patch b/xorg-xserver-server-xinerama-bug20557.patch
deleted file mode 100644 (file)
index bb9adca..0000000
--- a/xorg-xserver-server-xinerama-bug20557.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 24e682d0fcc98d7c3f63fa484cc28285df48b499 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 25 Mar 2009 13:08:27 +1000
-Subject: [PATCH] dix: ignore non-pointer events in XineramaCheckMotion (#20557)
-
-Note that deviceKeyButtonPointer and keyButtonPointer have the same wire
-layout, so we only need to check for event types.
-
-X.Org Bug 20557 <http://bugs.freedesktop.org/show_bug.cgi?id=20557>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/events.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/dix/events.c b/dix/events.c
-index 6743cae..63b0674 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -625,6 +625,23 @@ XineramaCheckMotion(xEvent *xE, DeviceIntPtr pDev)
- 
-     if (xE && !syncEvents.playingEvents)
-     {
-+        /* GetPointerEvents() guarantees that pointer events have the correct
-+           rootX/Y set already. */
-+        switch(xE->u.u.type)
-+        {
-+            case ButtonPress:
-+            case ButtonRelease:
-+            case MotionNotify:
-+                break;
-+            default:
-+                if (xE->u.u.type == DeviceButtonPress ||
-+                        xE->u.u.type == DeviceButtonRelease ||
-+                        xE->u.u.type == DeviceMotionNotify)
-+                    break;
-+                /* all other events return FALSE */
-+                return FALSE;
-+        }
-+
-       /* Motion events entering DIX get translated to Screen 0
-          coordinates.  Replayed events have already been
-          translated since they've entered DIX before */
--- 
-1.6.0.6
-

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 00714c3f19b6a1a35916ec5593815475103c6b73..dd3f4e67e4444285a1465c63911ae15ec2070417 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -17,18 +17,17 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.6.1
-Release:       2%{?with_multigl:.mgl}
+Version:       1.6.1.901
+Release:       0.1%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: ed0878bf32a24d4948c3b8a122a39eff
+# Source0-md5: e6cba1f07006143daa95ce3f11d999b2
 Source2:       xserver.pamd
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
 Patch2:                %{name}-fb-size.patch
 Patch3:                %{name}-exa.patch
-Patch4:                %{name}-xinerama-bug20557.patch
 Patch5:                %{name}-xinerama-cursors.patch
 Patch6:                %{name}-less-acpi-brokenness.patch
 Patch7:                %{name}-zap.patch
@@ -321,7 +320,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1