From f136161542c11d03b0ced76a630b25ec845cb4ff0728bcb1e33e7e23089b15b3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2013 13:28:10 +0000 Subject: [PATCH] Accepting request 202352 from home:tobijk:X11:XOrg update to version 2.10.1 OBS-URL: https://build.opensuse.org/request/show/202352 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=100 --- ...slash-bar-mapping-on-us-internationa.patch | 34 ------------ ...ate-arabic-script-digits-also-on-key.patch | 55 ------------------- n_suse.patch | 43 ++++++++------- xkeyboard-config-2.10.1.tar.bz2 | 3 + xkeyboard-config-2.9.tar.bz2 | 3 - xkeyboard-config.changes | 13 +++++ xkeyboard-config.spec | 8 +-- 7 files changed, 40 insertions(+), 119 deletions(-) delete mode 100644 U_Add-missing-backslash-bar-mapping-on-us-internationa.patch delete mode 100644 U_ara-digits-Generate-arabic-script-digits-also-on-key.patch create mode 100644 xkeyboard-config-2.10.1.tar.bz2 delete mode 100644 xkeyboard-config-2.9.tar.bz2 diff --git a/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch b/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch deleted file mode 100644 index 53c6af7..0000000 --- a/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3ee79efcad1fd85423cda2d1940cb6101c7b25ef Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Tue, 27 Aug 2013 14:50:03 +0200 -Subject: [PATCH 1/2] Add missing backslash/bar mapping on "us" international - variants (bfo#68606). - -https://bugs.freedesktop.org/show_bug.cgi?id=68606 -Signed-off-by: Stefan Dirsch ---- - symbols/us | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: xkeyboard-config-2.9/symbols/us -=================================================================== ---- xkeyboard-config-2.9.orig/symbols/us -+++ xkeyboard-config-2.9/symbols/us -@@ -132,6 +132,8 @@ xkb_symbols "intl" { - key { [ slash, question, questiondown, dead_hook ] }; - key { [ backslash, bar, notsign, brokenbar ] }; - -+ key { [ backslash, bar, backslash, bar ] }; -+ - include "level3(ralt_switch)" - }; - -@@ -186,6 +188,8 @@ xkb_symbols "alt-intl" { - key { [ period, greater, dead_abovedot, dead_circumflex ] }; - key { [ slash, question, dead_hook, dead_hook ] }; - -+ key { [ backslash, bar, backslash, bar ] }; -+ - include "level3(ralt_switch)" - }; - diff --git a/U_ara-digits-Generate-arabic-script-digits-also-on-key.patch b/U_ara-digits-Generate-arabic-script-digits-also-on-key.patch deleted file mode 100644 index 8828857..0000000 --- a/U_ara-digits-Generate-arabic-script-digits-also-on-key.patch +++ /dev/null @@ -1,55 +0,0 @@ -From fcb91cb1013cbdd87a6f77533f188d5934f24046 Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Thu, 29 Aug 2013 13:17:50 +0200 -Subject: [PATCH 2/2] ara(digits): Generate arabic script digits also on keypad - (fdo#68650) - -Signed-off-by: Stefan Dirsch ---- - symbols/ara | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/symbols/ara b/symbols/ara -index c0d57ef..1944b25 100644 ---- a/symbols/ara -+++ b/symbols/ara -@@ -100,6 +100,27 @@ xkb_symbols "azerty" { - }; - - partial alphanumeric_keys -+xkb_symbols "digits_KP" { -+ name[Group1]= "Arabic (digits_KP)"; -+ -+ // use arabic script digits on KP -+ -+ key { [ KP_Home, 0x1000667 ] }; // -+ key { [ KP_Up, 0x1000668 ] }; // -+ key { [ KP_Prior, 0x1000669 ] }; // -+ -+ key { [ KP_Left, 0x1000664 ] }; // -+ key { [ KP_Begin, 0x1000665 ] }; // -+ key { [ KP_Right, 0x1000666 ] }; // -+ -+ key { [ KP_End, 0x1000661 ] }; // -+ key { [ KP_Down, 0x1000662 ] }; // -+ key { [ KP_Next, 0x1000663 ] }; // -+ -+ key { [ KP_Insert, 0x1000660 ] }; // -+}; -+ -+partial alphanumeric_keys - xkb_symbols "digits" { - include "ara(basic)" - name[Group1]= "Arabic (digits)"; -@@ -116,6 +137,8 @@ xkb_symbols "digits" { - key { [ 0x1000668, asterisk ] }; - key { [ 0x1000669, parenright ] }; - key { [ 0x1000660, parenleft ] }; -+ -+ include "ara(digits_KP)" - }; - - partial alphanumeric_keys --- -1.8.1.4 - diff --git a/n_suse.patch b/n_suse.patch index cfdd07d..4859049 100644 --- a/n_suse.patch +++ b/n_suse.patch @@ -1,25 +1,9 @@ -- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part +-- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part -Index: symbols/pc -=================================================================== ---- symbols/pc.orig -+++ symbols/pc -@@ -29,9 +29,9 @@ xkb_symbols "pc105" { - key { [ Super_L ] }; - - key { [ Shift_R ] }; -- key { [ Control_R ] }; -+ key { [ Control_R, Multi_key ] }; - -- key { [ Super_R ] }; -+ key { [ Super_R, Multi_key ] }; - - key { [ Menu ] }; - -Index: rules/evdev.m_s.part -=================================================================== ---- rules/evdev.m_s.part.orig -+++ rules/evdev.m_s.part +diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part +index 5a6416b..23ce109 100644 +--- a/rules/evdev.m_s.part ++++ b/rules/evdev.m_s.part @@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m) - applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) @@ -27,3 +11,20 @@ Index: rules/evdev.m_s.part + $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) + applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) + * = +inet(evdev)+terminate(ctrl_alt_bksp) + +diff --git a/symbols/pc b/symbols/pc +index 996324d..fbbee47 100644 +--- a/symbols/pc ++++ b/symbols/pc +@@ -27,8 +27,8 @@ xkb_symbols "pc105" { + key { [ Super_L ] }; + + key { [ Shift_R ] }; +- key { [ Control_R ] }; +- key { [ Super_R ] }; ++ key { [ Control_R, Multi_key ] }; ++ key { [ Super_R, Multi_key ] }; + key { [ Menu ] }; + + // Beginning of modifier mappings. + \ No newline at end of file diff --git a/xkeyboard-config-2.10.1.tar.bz2 b/xkeyboard-config-2.10.1.tar.bz2 new file mode 100644 index 0000000..c9f41e0 --- /dev/null +++ b/xkeyboard-config-2.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b +size 908897 diff --git a/xkeyboard-config-2.9.tar.bz2 b/xkeyboard-config-2.9.tar.bz2 deleted file mode 100644 index 77d550c..0000000 --- a/xkeyboard-config-2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e89bc182a10d53c3e83efc6c3546de0fe5504d91c3dbc80d55cc64ddab5643a -size 912379 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index e831f37..1ead1a6 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 4 13:56:29 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 2.10.1: + The release 2.10 of xkeyboard-config did not really happen because of + the technical issues, so I am happy to present 2.10.1 + + massive cleanups of the codebase. + + various layouts fixes and code improvements. +- Remove upstreamed patches: + + Patch11: U_Add-missing-backslash-bar-mapping-on-us-internationa.patch + + Patch12: U_ara-digits-Generate-arabic-script-digits-also-on-key.patch +- Updated Patch100: n_suse.patch to work with this version. + ------------------------------------------------------------------- Tue Sep 10 09:06:00 UTC 2013 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 68a8a89..b32a74e 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -28,15 +28,13 @@ Url: http://www.freedesktop.org/Software/XKeyboardConfig Provides: XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm -Version: 2.9 +Version: 2.10.1 Release: 0 Summary: The X Keyboard Extension License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 Group: System/X11/Utilities Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2 Patch0: n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch -Patch11: U_Add-missing-backslash-bar-mapping-on-us-internationa.patch -Patch12: U_ara-digits-Generate-arabic-script-digits-also-on-key.patch Patch100: n_suse.patch # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed Patch109: disable-2xalt_2xctrl-toggle.diff @@ -57,9 +55,7 @@ make keyboards more accessible to people with physical impairments. %setup -q translation-update-upstream %patch0 -p1 -%patch11 -p1 -%patch12 -p1 -%patch100 +%patch100 -p1 %patch109 -p1 %build