From 7c84331bc664ead7633d31fbc9ec330a8a5e265f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Jul 09 2012 01:40:05 +0000
Subject: server 1.12.3


---

diff --git a/.gitignore b/.gitignore
index 0ef7a52..995843a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.12.0.tar.bz2
 /xorg-server-1.12.1.tar.bz2
 /xorg-server-1.12.2.tar.bz2
+/xorg-server-1.12.3.tar.bz2
diff --git a/sources b/sources
index 7ad7c27..f382ffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-791f0323b886abb7954de7f042bb7dc6  xorg-server-1.12.2.tar.bz2
+65a53b11bc01dcc97ee9b201dc620c32  xorg-server-1.12.3.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1deba5c..4530285 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.12.2
-Release:   4%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.3
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -110,7 +110,6 @@ Patch7017: xserver-1.12.2-xorg-touch-test.patch
 Patch7018: xserver-1.12-os-print-newline-after-printing-display-name.patch
 
 # send keycode/event type for slow keys enable (#816764)
-Patch7019: xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch
 Patch7020: xserver-1.12-xkb-fill-in-keycode-and-event-type-for-slow-keys-ena.patch
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -582,6 +581,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Jul 09 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.3-1
+- server 1.12.3
+
 * Tue Jun 26 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-4
 - send keycode/event type down the wire when SlowKeys enable, otherwise
   GNOME won't warn about it (#816764)
diff --git a/xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch b/xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch
deleted file mode 100644
index 3981a3d..0000000
--- a/xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2503936e2be820220ba0c4d80e45e268d433c063 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 6 Jun 2012 14:38:49 +1000
-Subject: [PATCH] xkb: warn if XKB SlowKeys have been automatically enabled
-
-Slow keys are enabled when the XKB AccessX features are generally enabled
-(ctrls->enabled_ctrls & XkbAccessXKeysMask) and either shift key is held for
-8 seconds. For the unsuspecting user this appears as if the keyboard
-suddenly stops working.
-
-Print a warning to the log, so we can later tell them "told you so".
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
----
- xkb/xkbAccessX.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index 111bf9f..765772b 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -295,10 +295,15 @@ AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
-     cn.eventType = 0;
-     cn.requestMajor = 0;
-     cn.requestMinor = 0;
--    if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask)
-+    if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask) {
-         AccessXKRGTurnOff((DeviceIntPtr) arg, &cn);
--    else
-+        LogMessage(X_INFO, "XKB SlowKeys are disabled.\n");
-+    }
-+    else {
-         AccessXKRGTurnOn((DeviceIntPtr) arg, XkbSlowKeysMask, &cn);
-+        LogMessage(X_INFO, "XKB SlowKeys are now enabled. Hold shift to disable.\n");
-+    }
-+
-     return 0;
- }
- 
--- 
-1.7.10.2
-