From 2d601bf698c4964290445ce8b106b478052af4de Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 29 May 2009 04:59:12 +0000 Subject: [PATCH] - xkeyboard-config 1.6 - Dropping all patches, merged upstream. --- .cvsignore | 2 +- sources | 2 +- usinet.patch | 38 -------- xkeyboard-config-1.4-battery.patch | 30 ------ xkeyboard-config-1.4-jp-tilde.patch | 31 ------- xkeyboard-config-1.5-evdevkbds.patch | 31 ------- xkeyboard-config-1.5-suspend-hibernate.patch | 35 ------- xkeyboard-config-1.5-terminate.patch | 96 -------------------- xkeyboard-config.spec | 19 ++-- 9 files changed, 9 insertions(+), 275 deletions(-) delete mode 100644 usinet.patch delete mode 100644 xkeyboard-config-1.4-battery.patch delete mode 100644 xkeyboard-config-1.4-jp-tilde.patch delete mode 100644 xkeyboard-config-1.5-evdevkbds.patch delete mode 100644 xkeyboard-config-1.5-suspend-hibernate.patch delete mode 100644 xkeyboard-config-1.5-terminate.patch diff --git a/.cvsignore b/.cvsignore index 15a4417..4c8fe20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xkeyboard-config-1.5.tar.bz2 +xkeyboard-config-1.6.tar.bz2 diff --git a/sources b/sources index 92f0dd5..7ffe1bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43c74312d303863b1b929554fa9ed9b3 xkeyboard-config-1.5.tar.bz2 +5ae575a9073af12cd71773e065b38b3a xkeyboard-config-1.6.tar.bz2 diff --git a/usinet.patch b/usinet.patch deleted file mode 100644 index b116c8b..0000000 --- a/usinet.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0e521d790e050f48c996673820c8be372a9856f Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Wed, 28 Jan 2009 12:05:47 +1000 -Subject: [PATCH] Add include inet(media_nav_common) by default for pc105 - ---- - rules/base.lists.part | 1 + - symbols/inet | 5 +++++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/rules/base.lists.part b/rules/base.lists.part -index e1897b1..1a752eb 100644 ---- a/rules/base.lists.part -+++ b/rules/base.lists.part -@@ -54,6 +54,7 @@ - microsoftoffice microsoftmult \ - mx1998 mx2500 mx2750 \ - oretec \ -+ pc105 \ - presario propeller \ - qtronix \ - rapidaccess rapidaccess2 thinkpad60 \ -diff --git a/symbols/inet b/symbols/inet -index 339b72d..ba55f43 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -1797,3 +1797,8 @@ xkb_symbols "compalfl90" { - key { [ XF86MonBrightnessDown ] }; - }; - -+// Generic -+partial alphanumeric_keys -+xkb_symbols "pc105" { -+ include "inet(media_nav_common)" -+}; --- -1.6.0.6 - diff --git a/xkeyboard-config-1.4-battery.patch b/xkeyboard-config-1.4-battery.patch deleted file mode 100644 index 7aee404..0000000 --- a/xkeyboard-config-1.4-battery.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Mon, 24 Nov 2008 13:01:22 +1000 -Subject: [PATCH] Map KEY_BATTERY, WLAN, BLUETOOTH, UWB to their XF86<...> keycodes. - ---- - symbols/inet | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/symbols/inet b/symbols/inet -index 54ec241..50b559b 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -158,9 +158,10 @@ xkb_symbols "evdev" { - key { [ XF86MailForward ] }; - key { [ XF86Save ] }; - key { [ XF86Documents ] }; --// key { [ ] }; // KEY_BATTERY --// key { [ ] }; // KEY_BLUETOOTH --// key { [ ] }; // KEY_WLAN -+ key { [ XF86Battery ] }; // KEY_BATTERY -+ key { [ XF86Bluetooth ] }; // KEY_BLUETOOTH -+ key { [ XF86WLAN ] }; // KEY_WLAN -+ key { [ XF86UWB ] }; // KEY_UWB - // key { [ ] }; // KEY_VIDEO_NEXT -- drive next video source - // key { [ ] }; // KEY_VIDEO_PREV -- drive previous video source - // key { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min --- -1.6.0.3 - diff --git a/xkeyboard-config-1.4-jp-tilde.patch b/xkeyboard-config-1.4-jp-tilde.patch deleted file mode 100644 index b76219c..0000000 --- a/xkeyboard-config-1.4-jp-tilde.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 824ce3a400a452929f90a038033c83055c01a2d7 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Mon, 24 Nov 2008 12:59:09 +1000 -Subject: [PATCH] Map TLDE to Zenkaku/Hankaku in jp, and BKSL to bracket/brace right (#469537). - -This patch is only needed for jp on a non-jp106 keyboard model. ---- - symbols/jp | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/symbols/jp b/symbols/jp -index 694090c..ef0b0f7 100644 ---- a/symbols/jp -+++ b/symbols/jp -@@ -24,6 +24,13 @@ xkb_symbols "common" { - symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] - }; - -+ key { -+ type[Group1]="PC_ALT_LEVEL2", -+ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] -+ }; -+ -+ key { [ bracketright, braceright ] }; -+ - key { [ 1, exclam ] }; - key { [ 2, quotedbl ] }; - key { [ 3, numbersign ] }; --- -1.6.0.3 - diff --git a/xkeyboard-config-1.5-evdevkbds.patch b/xkeyboard-config-1.5-evdevkbds.patch deleted file mode 100644 index df93170..0000000 --- a/xkeyboard-config-1.5-evdevkbds.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e8b234d2566c1a5dcb5d41706f14a66e426c7d30 Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Sun, 1 Feb 2009 15:54:12 +0000 -Subject: [PATCH] introducing $evdevkbds - ---- - ChangeLog | 4 +++- - rules/base.lists.part | 1 + - rules/evdev.m_s.part | 3 ++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/rules/base.lists.part b/rules/base.lists.part -index e1897b1..7cbd874 100644 ---- a/rules/base.lists.part -+++ b/rules/base.lists.part -@@ -87,3 +87,4 @@ - vn \ - za - -+! $evdevkbds = ibm_spacesaver -diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part -index fd6590d..516c976 100644 ---- a/rules/evdev.m_s.part -+++ b/rules/evdev.m_s.part -@@ -1 +1,2 @@ -- * = +inet(evdev) -+ $evdevkbds = +inet(evdev)+inet(%m) -+ * = +inet(evdev) --- -1.6.0.6 - diff --git a/xkeyboard-config-1.5-suspend-hibernate.patch b/xkeyboard-config-1.5-suspend-hibernate.patch deleted file mode 100644 index c5bd2d2..0000000 --- a/xkeyboard-config-1.5-suspend-hibernate.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3b0326435e6f02c0d1c92b1c7f9902d81f1245aa Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 5 Mar 2009 13:01:20 +1000 -Subject: [PATCH] Map I213 to XF86Suspend, and I255 to XF86Hibernate. - -Signed-off-by: Peter Hutterer ---- - symbols/inet | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/symbols/inet b/symbols/inet -index ba55f43..dafb406 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -165,7 +165,7 @@ xkb_symbols "evdev" { - key { [ XF86AudioPause ] }; - key { [ XF86Launch3 ] }; - key { [ XF86Launch4 ] }; -- key { [ XF86Standby ] }; -+ key { [ XF86Suspend ] }; - key { [ XF86Close ] }; - key { [ XF86AudioPlay ] }; - key { [ XF86Forward ] }; -@@ -205,6 +205,8 @@ xkb_symbols "evdev" { - // key { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min - // key { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off - // key { [ ] }; // KEY_DISPLAY_OFF -- turn off display -+// key { [ ] }; // KEY_WIMAX -+ key { [ XF86Hibernate ] }; // KEY_HIBERNATE - - }; - --- -1.6.0.6 - diff --git a/xkeyboard-config-1.5-terminate.patch b/xkeyboard-config-1.5-terminate.patch deleted file mode 100644 index 54b923b..0000000 --- a/xkeyboard-config-1.5-terminate.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ff416cce47e29c113c706684a05ebb112c9116b3 Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Tue, 7 Apr 2009 04:18:32 +0200 -Subject: [PATCH] Make Terminate_Server on ctrl+alt+bksp an option - -This disables zapping by default, it can be reenabled with -'setxkbmap -option terminate:ctrl_alt_bksp'. ---- - rules/base.o_s.part | 1 + - rules/base.xml.in | 12 ++++++++++++ - symbols/pc | 5 +---- - symbols/srvr_ctrl | 13 +++++++++---- - 4 files changed, 23 insertions(+), 8 deletions(-) - -diff --git a/rules/base.o_s.part b/rules/base.o_s.part -index c401790..9843c61 100644 ---- a/rules/base.o_s.part -+++ b/rules/base.o_s.part -@@ -97,4 +97,5 @@ - shift:breaks_caps = +shift(breaks_caps) - esperanto:qwerty = +epo(qwerty) - esperanto:dvorak = +epo(dvorak) -+ terminate:ctrl_alt_bksp = +srvr_ctrl(terminate_ctrl_alt_bksp) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index a7616c5..fe7a26f 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -4914,5 +4914,17 @@ - - - -+ -+ -+ terminate -+ <_description>Key sequence to kill the X server -+ -+ -+ - - -diff --git a/symbols/pc b/symbols/pc -index 07472b8..9474df5 100644 ---- a/symbols/pc -+++ b/symbols/pc -@@ -19,10 +19,7 @@ xkb_symbols "pc105" { - include "pc(editing)" - include "keypad(x11)" - -- key { -- type="CTRL+ALT", -- symbols[Group1]= [ BackSpace, Terminate_Server ] -- }; -+ key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; -diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl -index 712f763..9b333e3 100644 ---- a/symbols/srvr_ctrl -+++ b/symbols/srvr_ctrl -@@ -13,10 +13,7 @@ xkb_symbols "xfree86" { - partial keypad_keys - xkb_symbols "stdkeypad" { - -- key { -- type="CTRL+ALT", -- symbols[Group1]= [ BackSpace, Terminate_Server ] -- }; -+ include "srvr_ctrl(terminate_ctrl_alt_bksp)" - - // Ungrab cancels server/keyboard/pointer grabs - key { -@@ -44,6 +41,14 @@ xkb_symbols "stdkeypad" { - - }; - -+partial modifier_keys -+xkb_symbols "terminate_ctrl_alt_bksp" { -+ key { -+ type="CTRL+ALT", -+ symbols[Group1]= [ NoSymbol, Terminate_Server ] -+ }; -+}; -+ - partial function_keys - xkb_symbols "fkey2vt" { - --- -1.5.6.3 - diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index f327da0..f3dcb67 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -3,23 +3,14 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 1.5 -Release: 5%{?dist} +Version: 1.6 +Release: 1%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 -Patch2: usinet.patch -# Sent to svu, partially committed as d0ff2e0d4ac, expect for 1.6 -Patch4: xkeyboard-config-1.4-battery.patch -# Sent to svu -Patch5: xkeyboard-config-1.4-jp-tilde.patch -# Taken from upstream, remove with 1.6 -Patch6: xkeyboard-config-1.5-evdevkbds.patch -Patch7: xkeyboard-config-1.5-suspend-hibernate.patch -Patch8: xkeyboard-config-1.5-terminate.patch BuildArch: noarch @@ -61,7 +52,7 @@ fi git add . git commit -a -q -m "%{version} baseline." -git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) +#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) %build %configure \ @@ -101,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Fri May 29 2009 Peter Hutterer - 1.6-1 +- xkeyboard-config 1.6 +- Dropping all patches, merged upstream. + * Tue Apr 07 2009 Peter Hutterer - 1.5-5 - xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default pc symbols, add terminate:ctrl_alt_bksp.