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 6d4ee90..89c7a64 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,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Aug 20 2012 Peter Hutterer 1.12.3-1 +- xserver 1.12.3 +- Update displayfd newline patch to upstream's version + * Tue Jun 26 2012 Peter Hutterer 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-os-print-newline-after-printing-display-name.patch b/xserver-1.12-os-print-newline-after-printing-display-name.patch index 5d73645..8a3cd7f 100644 --- a/xserver-1.12-os-print-newline-after-printing-display-name.patch +++ b/xserver-1.12-os-print-newline-after-printing-display-name.patch @@ -1,4 +1,4 @@ -From 9d1c39b2115d3e7a403715083a584818f10feba2 Mon Sep 17 00:00:00 2001 +From 014ad46f1b353a95e2c4289443ee857cfbabb3ae Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Jun 2012 14:26:15 +1000 Subject: [PATCH] os: print newline after printing display name @@ -8,23 +8,24 @@ descriptor. Plus, this restores the behaviour we had for this patch in Fedora since server 1.6 (April 2009). Signed-off-by: Peter Hutterer +Reviewed-by: Dave Airlie +Reviewed-by: Chase Douglas --- - os/connection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + os/connection.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/os/connection.c b/os/connection.c -index 039942f..5144d16 100644 +index 039942f..3441472 100644 --- a/os/connection.c +++ b/os/connection.c -@@ -423,7 +423,7 @@ CreateWellKnownSockets(void) - } - if (!found) - FatalError("Failed to find a socket to listen on"); -- snprintf(dynamic_display, sizeof(dynamic_display), "%d", i); -+ snprintf(dynamic_display, sizeof(dynamic_display), "%d\n", i); - display = dynamic_display; +@@ -353,6 +353,7 @@ NotifyParentProcess(void) + #if !defined(WIN32) + if (dynamic_display[0]) { + write(displayfd, dynamic_display, strlen(dynamic_display)); ++ write(displayfd, "\n", 1); + close(displayfd); } - + if (RunFromSmartParent) { -- -1.7.10.2 +1.7.11.2 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 -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 -Reviewed-by: Dan Nicholson ---- - 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 -