From 0476b95c283823e306cc00d33b09791997d068f27723e37e130e82551a47cec4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 4 Feb 2014 15:11:52 +0000 Subject: [PATCH] - U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch * reverse apply the above patch in order to fix again the KPDL key on french, italian and netherland keyboards (bnc#671931) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=106 --- ...it-fr-and-nl-keyboards-generate-KP_S.patch | 62 +++++++++++++++++++ xkeyboard-config.changes | 7 +++ xkeyboard-config.spec | 2 + 3 files changed, 71 insertions(+) create mode 100644 U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch diff --git a/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch b/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch new file mode 100644 index 0000000..d27c5ee --- /dev/null +++ b/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch @@ -0,0 +1,62 @@ +From cf93beb47f9907946dd72ca4d481ffbbbadda53a Mon Sep 17 00:00:00 2001 +From: Egbert Eich +Date: Mon, 30 May 2011 10:51:58 +0200 +Subject: [PATCH] Let key on it,fr and nl keyboards generate + KP_Separator + +Notwithstanding the never ending discussion what character this +key on the numeric keypad should produce this key should produce +what is imprinted on the keyboards. After all all three countries +are observing the SI standards. +This makes this layout more consistent and match for instance +what is done in the de layout. + +Signed-off-by: Egbert Eich +--- + symbols/fr | 2 ++ + symbols/it | 2 ++ + symbols/nl | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/symbols/fr b/symbols/fr +index 3898b1c..9c89db8 100644 +--- a/symbols/fr ++++ b/symbols/fr +@@ -36,6 +36,8 @@ xkb_symbols "basic" { + key { [ colon, slash, periodcentered, division ] }; + key { [ exclam, section, dead_belowdot, dead_abovedot ] }; + ++ include "kpdl(comma)" ++ + include "level3(ralt_switch)" + }; + +diff --git a/symbols/it b/symbols/it +index 3e402c9..9e6ed01 100644 +--- a/symbols/it ++++ b/symbols/it +@@ -33,6 +33,8 @@ xkb_symbols "basic" { + + key { [ less, greater,guillemotleft,guillemotright] }; + ++ include "kpdl(comma)" ++ + include "level3(ralt_switch)" + }; + +diff --git a/symbols/nl b/symbols/nl +index ff60dbb..d37ff27 100644 +--- a/symbols/nl ++++ b/symbols/nl +@@ -49,6 +49,8 @@ xkb_symbols "basic" { + + key { [bracketright, bracketleft, bar, brokenbar ] }; + ++ include "kpdl(comma)" ++ + include "level3(ralt_switch)" + }; + +-- +1.8.4 + diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index f3d4d4e..04d70ba 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 4 15:06:41 UTC 2014 - sndirsch@suse.com + +- U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch + * reverse apply the above patch in order to fix again the KPDL + key on french, italian and netherland keyboards (bnc#671931) + ------------------------------------------------------------------- Thu Jan 30 11:08:13 UTC 2014 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index a27569b..d7d055d 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -35,6 +35,7 @@ License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 Group: System/X11/Utilities Source: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2 Patch0: n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch +Patch1: U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.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 @@ -55,6 +56,7 @@ make keyboards more accessible to people with physical impairments. %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 -R %patch100 -p1 %patch109 -p1