From 6719a2c59c68bacbf7c6a549feafc50885055b3b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Apr 2010 00:16:14 +0000 Subject: [PATCH] - Move F-12 patches forward, upstream is a bit unresponsive. --- ...nd-New-Shekel-sign-to-israeli-layout.patch | 62 +++++++++++++++++++ ...mbols-de-remove-BKSP-from-neo-layout.patch | 31 ++++++++++ xkeyboard-config.spec | 10 ++- 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch create mode 100644 0001-symbols-de-remove-BKSP-from-neo-layout.patch diff --git a/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch b/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch new file mode 100644 index 0000000..3bb1a80 --- /dev/null +++ b/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch @@ -0,0 +1,62 @@ +From 75435d0906fa6722155a445e694b5ff45f71608a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 25 Feb 2010 10:10:14 +1000 +Subject: [PATCH] Add Euro and New Shekel sign to israeli layout. + +According to [1], the standard layout requires the shekel sign on AltGr + a, +although Windows has it on AltGr + 4. The latter is already in use for some +other character, so let's put it where the standard requires it to be. +Euro sign goes on AltGr + e. + +This requires the inclusion of level3(ralt_switch) to get the IsoLevel3. + +[1] http://en.wikipedia.org/wiki/Shekel_sign + +Fedora Bug https://bugzilla.redhat.com/show_bug.cgi?id=542879 + +Signed-off-by: Peter Hutterer +--- + symbols/il | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/symbols/il b/symbols/il +index 4a3055d..cc29b12 100644 +--- a/symbols/il ++++ b/symbols/il +@@ -16,7 +16,6 @@ xkb_symbols "basic" { + + key { [ slash, Q ] }; + key { [ apostrophe, W ] }; +- key { [ hebrew_qoph, E ] }; + key { [ hebrew_resh, R ] }; + key { [ hebrew_aleph,T ] }; + key { [ hebrew_tet, Y ] }; +@@ -25,7 +24,6 @@ xkb_symbols "basic" { + key { [ hebrew_finalmem, O ] }; + key { [ hebrew_pe, P ] }; + +- key { [ hebrew_shin, A ] }; + key { [ hebrew_dalet,S ] }; + key { [ hebrew_gimel,D ] }; + key { [ hebrew_kaph, F ] }; +@@ -52,6 +50,8 @@ xkb_symbols "basic" { + + key { [ semicolon, asciitilde,0x10005b0 ]}; // Sheva + key { [ period, question, 0x10005c3 ]}; // Sof Pasuq ++ key { [ hebrew_qoph, E, EuroSign ]}; ++ key { [ hebrew_shin, A, 0x10020AA ]}; + + // The following may get overriden by the iso9995-3(basic101) symbols. + // therefore they are included here. +@@ -77,6 +77,8 @@ xkb_symbols "basic" { + key { [ bracketleft, braceleft, 0x10005bd ]}; // Meteg + + key { [ backslash, bar, 0x10005bb ]}; // Qubuts ++ ++ include "level3(ralt_switch)" + }; + + +-- +1.6.6.1 + diff --git a/0001-symbols-de-remove-BKSP-from-neo-layout.patch b/0001-symbols-de-remove-BKSP-from-neo-layout.patch new file mode 100644 index 0000000..2b259b6 --- /dev/null +++ b/0001-symbols-de-remove-BKSP-from-neo-layout.patch @@ -0,0 +1,31 @@ +From bd0e2bdba64173bbb82f85a3358dd85296ed86ee Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 15 Mar 2010 14:18:14 +1000 +Subject: [PATCH] symbols/de: remove BKSP from neo layout. + +All it does is assign backspace to it on all levels and we pick this up +through the pc symbols. + +Fedora Bug 521482 + +Signed-off-by: Peter Hutterer +--- + symbols/de | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/symbols/de b/symbols/de +index b23aaf6..02b7c45 100644 +--- a/symbols/de ++++ b/symbols/de +@@ -287,8 +287,6 @@ xkb_symbols "neo" { + key { [ minus, emdash, NoSymbol, U2011, minus, NoSymbol, hyphen ] }; + key { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, U030F, NoSymbol, NoSymbol ] }; + +- key { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace ] }; +- + // top row + // -------------------------------------------------------------- + // xvlcwkhgfqß +-- +1.6.6.1 + diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 27f5ae3..10d9a7b 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -4,7 +4,7 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config Version: 1.8 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -12,6 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 +Patch02: 0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch +Patch03: 0001-symbols-de-remove-BKSP-from-neo-layout.patch + BuildArch: noarch BuildRequires: pkgconfig @@ -38,7 +41,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 \ @@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Tue Apr 06 2010 Peter Hutterer 1.8-4 +- Move F-12 patches forward, upstream is a bit unresponsive. + * Tue Mar 02 2010 Peter Hutterer 1.8-3 - only package files in /usr/share/X11/xkb (#569400)