From 5aaa2af5340c038acd586f181b53b6e6553980cf Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Sun, 20 Feb 2005 21:27:36 +0000 Subject: [PATCH] - Put "Meta_acute" back in German keymaps, just ignore it in (loadkeys -u) (patch by Jochen Schmitt) --- kbd-1.12-Meta_utf8.patch | 11 +++++++++++ kbd.spec | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 kbd-1.12-Meta_utf8.patch diff --git a/kbd-1.12-Meta_utf8.patch b/kbd-1.12-Meta_utf8.patch new file mode 100644 index 0000000..9bc68b6 --- /dev/null +++ b/kbd-1.12-Meta_utf8.patch @@ -0,0 +1,11 @@ +--- kbd-1.12/src/ksyms.c.org 2005-01-11 16:38:32.000000000 +0100 ++++ kbd-1.12/src/ksyms.c 2005-01-11 16:46:19.000000000 +0100 +@@ -1710,6 +1710,8 @@ + keycode = ksymtocode(s+5); + if (KTYP(keycode) == KT_LATIN) + return K(KT_META, KVAL(keycode)); ++ else if(prefer_unicode) ++ return (0); + /* fall through to error printf */ + } + diff --git a/kbd.spec b/kbd.spec index f612946..ecd9cb4 100644 --- a/kbd.spec +++ b/kbd.spec @@ -17,7 +17,7 @@ Patch1: kbd-1.08-compose.patch Patch2: kbd-1.08-terminal.patch Patch3: kbd-1.08-rukbd.patch Patch4: kbd-1.12-setfont-man.patch -Patch5: kbd-1.12-Meta_acute.patch +Patch5: kbd-1.12-Meta_utf8.patch Obsoletes: console-tools Provides: console-tools Conflicts: util-linux < 2.11r-9 @@ -37,7 +37,7 @@ fonts, the virtual terminals and font files. %patch2 -p1 -b .terminal %patch3 -p1 %patch4 -p1 -b .man -%patch5 -p1 +%patch5 -p1 -b .Meta_utf8 # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -121,7 +121,9 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \ %changelog * Sun Feb 20 2005 Miloslav Trmac - 1.12-5 -- Don't ship patch backup files, second attempt +- Put "Meta_acute" back in German keymaps, just ignore it in (loadkeys -u) + (patch by Jochen Schmitt) +- Don't ship patch backup files, simpler way * Sat Feb 19 2005 Miloslav Trmac - 1.12-4 - Don't ship a patch backup file