rpms/console-setup
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use the "base" XKB files, not "xorg"

Browse Source
This commit is contained in:
Vitezslav Crhonek 2021-05-11 14:55:20 +02:00
parent 3c2996aeb5
commit bd698caea7
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
console-setup-1.202-use-base-xkb-files.patch Normal file
View File

@ -0,0 +1,42 @@
diff -up console-setup-1.202/Keyboard/ckbcomp.orig console-setup-1.202/Keyboard/ckbcomp
--- console-setup-1.202/Keyboard/ckbcomp.orig 2021-05-11 14:19:31.003284483 +0200
+++ console-setup-1.202/Keyboard/ckbcomp 2021-05-11 14:21:01.047140800 +0200
@@ -181,7 +181,7 @@ EOT
}
}
-$rules = 'xorg' if (! $rules);
+$rules = 'base' if (! $rules);
$model = 'pc104' if (! $model);
$backspace = $freebsd ? 'bs' : 'del' if (! $backspace);
diff -up console-setup-1.202/Keyboard/Makefile.orig console-setup-1.202/Keyboard/Makefile
--- console-setup-1.202/Keyboard/Makefile.orig 2020-06-23 14:21:52.000000000 +0200
+++ console-setup-1.202/Keyboard/Makefile 2021-05-11 14:20:19.575757490 +0200
@@ -83,4 +83,4 @@ $~maintainer-clean: $~clean
cd $(kbddir) && ./xmlreader >KeyboardNames.pl
$./KeyboardNames.pl:
- $(kbddir)/xmlreader $(xkbdir)/rules/xorg.xml >$@
+ $(kbddir)/xmlreader $(xkbdir)/rules/base.xml >$@
diff -up console-setup-1.202/man/keyboard.5.orig console-setup-1.202/man/keyboard.5
--- console-setup-1.202/man/keyboard.5.orig 2021-05-11 14:19:30.999284443 +0200
+++ console-setup-1.202/man/keyboard.5 2021-05-11 14:22:47.877051436 +0200
@@ -24,7 +24,7 @@ file is based on the
.SM XKB
options XkbModel, XkbLayout, XkbVariant and XkbOptions.
Unfortunately, there is little documentation how to use them. Description of all possible values for these options can be found in the file
-.IR xorg.lst .
+.IR base.lst .
.P
You might want to read \*(lqThe XKB Configuration Guide\*(rq by Kamil
Toman and Ivan U. Pascal:
@@ -157,7 +157,7 @@ file is
.IR /etc/default/keyboard .
Description of all available keyboard models, layouts, variants and
options is available in
-.IR /usr/share/X11/xkb/rules/xorg.lst .
+.IR /usr/share/X11/xkb/rules/base.lst .
In most cases, in
.IR /lib/kbd/keymaps/
you will find several keymaps that can be used with the variable

9
console-setup.spec
View File

@ -1,7 +1,7 @@
Name: console-setup
Version: 1.202
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Tools for configuring the console using X Window System key maps
# For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb
@ -15,6 +15,8 @@ Patch0: console-setup-1.76-paths.patch
Patch1: console-setup-1.76-fsf-address.patch
# Removes Caps_Lock to CtrlL_Lock substitution
Patch2: console-setup-1.84-ctrll-lock.patch
# Use the "base" XKB files, not "xorg", patch by Peter Hutterer, sent to upstream, see bz#1951453
Patch3: console-setup-1.202-use-base-xkb-files.patch
Requires: kbd
# require 'xkeyboard-config' to have X Window keyboard descriptions?
@ -50,6 +52,7 @@ not wasted but used for another symbol.
%patch0 -p1 -b .paths
%patch1 -p1 -b .fsf-address
%patch2 -p1 -b .ctrll-lock
%patch3 -p1 -b .use-base-xkb-files
%build
@ -94,6 +97,10 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \
%changelog
* Tue May 11 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.202-2
- Use the "base" XKB files, not "xorg" (patch by Peter Hutterer)
Resolves: #1951453
* Wed Mar 24 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.202-1
- Update to latest upstream version
Resolves: #1941247