From ab0d61b00aa8b566446a4141b09b87b3a62c7417142e2a1847afb18b816776ea Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 30 Aug 2013 08:29:41 +0000 Subject: [PATCH] - U_Add-missing-backslash-bar-mapping-on-us-internationa.patch * Add missing backslash/bar mapping on "us" international variants (fdo#68606, bnc#831823). - U_ara-digits-Generate-arabic-script-digits-also-on-key.patch * ara(digits): Generate arabic script digits also on keypad (fdo#68650, bnc#831823) - refreshed patches OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=93 --- ...slash-bar-mapping-on-us-internationa.patch | 34 ++++++++++++ ...ate-arabic-script-digits-also-on-key.patch | 55 +++++++++++++++++++ disable-2xalt_2xctrl-toggle.diff | 10 ++-- p_suse.diff | 8 +-- xkeyboard-config.changes | 11 ++++ xkeyboard-config.spec | 4 ++ 6 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 U_Add-missing-backslash-bar-mapping-on-us-internationa.patch create mode 100644 U_ara-digits-Generate-arabic-script-digits-also-on-key.patch diff --git a/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch b/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch new file mode 100644 index 0000000..53c6af7 --- /dev/null +++ b/U_Add-missing-backslash-bar-mapping-on-us-internationa.patch @@ -0,0 +1,34 @@ +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 new file mode 100644 index 0000000..8828857 --- /dev/null +++ b/U_ara-digits-Generate-arabic-script-digits-also-on-key.patch @@ -0,0 +1,55 @@ +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/disable-2xalt_2xctrl-toggle.diff b/disable-2xalt_2xctrl-toggle.diff index 5483419..a91765e 100644 --- a/disable-2xalt_2xctrl-toggle.diff +++ b/disable-2xalt_2xctrl-toggle.diff @@ -1,8 +1,8 @@ -Index: xkeyboard-config-2.1/rules/base.xml.in +Index: xkeyboard-config-2.9/rules/base.xml.in =================================================================== ---- xkeyboard-config-2.1.orig/rules/base.xml.in -+++ xkeyboard-config-2.1/rules/base.xml.in -@@ -4713,6 +4713,7 @@ +--- xkeyboard-config-2.9.orig/rules/base.xml.in ++++ xkeyboard-config-2.9/rules/base.xml.in +@@ -5612,6 +5612,7 @@ <_description>Right Alt (while pressed) @@ -10,7 +10,7 @@ Index: xkeyboard-config-2.1/rules/base.xml.in diff --git a/p_suse.diff b/p_suse.diff index a0dd6cf..cfdd07d 100644 --- a/p_suse.diff +++ b/p_suse.diff @@ -4,7 +4,7 @@ Index: symbols/pc =================================================================== --- symbols/pc.orig +++ symbols/pc -@@ -34,9 +34,9 @@ xkb_symbols "pc105" { +@@ -29,9 +29,9 @@ xkb_symbols "pc105" { key { [ Super_L ] }; key { [ Shift_R ] }; @@ -16,11 +16,9 @@ Index: symbols/pc key { [ Menu ] }; -- Add Support ctrl-alt-backspace Server Termination. - -Index: xkeyboard-config-2.1/rules/evdev.m_s.part +Index: rules/evdev.m_s.part =================================================================== ---- rules/evdev.m_s.part +--- rules/evdev.m_s.part.orig +++ rules/evdev.m_s.part @@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m) diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index ae08dac..395c585 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 30 08:11:24 UTC 2013 - sndirsch@suse.com + +- U_Add-missing-backslash-bar-mapping-on-us-internationa.patch + * Add missing backslash/bar mapping on "us" international + variants (fdo#68606, bnc#831823). +- U_ara-digits-Generate-arabic-script-digits-also-on-key.patch + * ara(digits): Generate arabic script digits also on keypad + (fdo#68650, bnc#831823) +- refreshed patches + ------------------------------------------------------------------- Tue Aug 27 12:23:35 UTC 2013 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 1555315..f256343 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -35,6 +35,8 @@ 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: u_zhe-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: p_suse.diff # 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 @@ -55,6 +57,8 @@ make keyboards more accessible to people with physical impairments. %setup -q translation-update-upstream %patch0 -p5 +%patch11 -p1 +%patch12 -p1 %patch100 %patch109 -p1