pool/kbd
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

https://bugzilla.opensuse.org/show_bug.cgi?id=1176854

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2020-09-23 11:01:11 +00:00 committed by Git OBS Bridge
parent c48baa969f
commit 24a332663b
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kbd-1.15.5-loadkeys-search-path.patch
View File

@ -7,7 +7,7 @@ Index: kbd-2.2.0/src/loadkeys.c
#include "keymap.h" #include "keymap.h"
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
+static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn)) static void __attribute__((noreturn))

11
kbd.changes
View File

@ -1,14 +1,3 @@
-------------------------------------------------------------------
Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- Make kbdsettings working in both bash and dash (boo#1175040).
-------------------------------------------------------------------
Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
(boo#1176302).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <jslaby@suse.com> Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <jslaby@suse.com>

11
kbdsettings
View File

@ -7,12 +7,11 @@
for i in NUM SCR CAPS; do for i in NUM SCR CAPS; do
conf=$(eval echo KBD_${i}LOCK) conf=$(eval echo KBD_${i}LOCK)
eval confval=\"\$$conf\" [ -z ${!conf} ] && continue
[ -z "$confval" ] && continue param=$(echo ${i,,} | sed 's/scr/scroll/')
param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
case "$confval" in case "${!conf}" in
yes) yes)
if [ $param = "num" ]; then if [ $param = "num" ]; then
touch /run/numlock-on touch /run/numlock-on
@ -36,11 +35,11 @@ for i in NUM SCR CAPS; do
/usr/bin/setleds -D -$param < /dev/$tty /usr/bin/setleds -D -$param < /dev/$tty
fi fi
else else
echo "Value $confval invalid for $conf" echo "Value ${!conf} invalid for $conf"
fi fi
;; ;;
*) *)
echo "error: unknown value $confval in $conf" echo "error: unknown value ${!conf} in $conf"
;; ;;
esac esac
done done