From 97543a3f38a48c27e3a1cb3412930b19fa6cd130 Mon Sep 17 00:00:00 2001 From: yanan-rock Date: Sun, 27 Sep 2020 10:28:42 +0800 Subject: [PATCH] Removes Caps_Lock to CtrlL_Lock substitution --- console-setup-1.84-ctrll-lock.patch | 35 +++++++++++++++++++++++++++++ console-setup.spec | 11 +++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 console-setup-1.84-ctrll-lock.patch diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch new file mode 100644 index 0000000..147e2a5 --- /dev/null +++ b/console-setup-1.84-ctrll-lock.patch @@ -0,0 +1,35 @@ +diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp +--- console-setup/Keyboard/ckbcomp.orig 2018-06-21 10:58:36.262160943 +0200 ++++ console-setup/Keyboard/ckbcomp 2018-06-27 13:04:01.843639711 +0200 +@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( + + my $KEYMAP = ''; # This variable contains the generated keymap + +-my $broken_caps = 0; # In unicode mode Caps_Lock doesn't work for non-ASCII +- # letters. 1 = the keymap contains non-ascii letters. +- # See http://bugzilla.kernel.org/show_bug.cgi?id=7746#c21 +- + my %keycodes_table; # x keysym -> x key code + my %aliases; # x keysym -> x keysym + +@@ -4376,9 +4372,6 @@ sub print_vector { + my $u = ord (uc (pack ("U", $v))); + my $c = ($v == $l ? $u : $l); + $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); +- if ($v != $c && $v gt 0x7f) { +- $broken_caps = 1; +- } + } + } + if ($no_NoSymbol) { +@@ -4776,10 +4769,6 @@ keycode 127 = + die "$0: Unsupported keyboard type $arch\n"; + } + +-if ($broken_caps) { +- $KEYMAP =~ s/Caps_Lock/CtrlL_Lock/g; +-} +- + print $KEYMAP; + + if ($freebsd) { diff --git a/console-setup.spec b/console-setup.spec index de00df8..35bb351 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,12 +1,13 @@ Name: console-setup Version: 1.184 -Release: 5 +Release: 6 Summary: Console font and keymap setup program License: GPLv2+ and MIT and Public Domain URL: https://packages.debian.org/cs/sid/console-setup Source0: http://sourcearchive.raspbian.org/main/c/console-setup/console-setup_1.184.tar.xz Patch0: console-setup-1.76-paths.patch Patch1: console-setup-1.76-fsf-address.patch +Patch2: console-setup-1.84-ctrll-lock.patch BuildArch: noarch BuildRequires: perl-generators perl(encoding) @@ -45,5 +46,11 @@ make prefix=%{buildroot} install-linux %{_mandir}/man*/* %changelog -* Mon Dec 9 2019 openEuler Buildteam - 1.184-4 +* Sun Sep 27 2020 yanan - 1.184-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Remove Caps Lock to CtrlL_Lock substitution + +* Mon Dec 9 2019 openEuler Buildteam - 1.184-5 - Package init -- Gitee