* setfont: Fixed regression in argument parsing. * dumpkeys: Fixed dumpkeys on pc and non-pc architectures. * libkeymap: Add API to get/set keymap keywords. Export functions to convert the value to kernel code. Fix double kbdfile open. Dump action codes for keycode 0. * libkfont: Fix buffer allocation for doubled font. Check console mode. * keymaps: Add hcesar layout, for portuguese speaking countries. Update Colemak-DH keymaps with upstream changes. sv-latin1.map: make Ctrl+AltGr+9 act as Ctrl+]. * fonts: Remove non-free Agafari fonts. (bnc#95915, remove repack_kbd.sh) * other: Update man pages. Remove deprecated startup scripts. (Refresh kbd-2.0.2-fix-bashisms.patch.) Remove outdated docs. (Drop kbd-1.15.2-docu-X11R6-xorg.patch.) Update translations. - Drop upstreamed patches: kbd-1.15.2-sv-latin1-keycode10.patch, kbd-2.0.2-doshell-reference.patch. - Refresh kbd-1.15.5-loadkeys-search-path.patch. - Releases are signed, add kbd.keyring and the signature. - Build documentation with doxygen. kbdsettings, boo#1179897, jsc#PED-7814). OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=182
18 lines
459 B
Diff
18 lines
459 B
Diff
Index: kbd-2.7.1/src/loadkeys.c
|
|
===================================================================
|
|
--- kbd-2.7.1.orig/src/loadkeys.c
|
|
+++ kbd-2.7.1/src/loadkeys.c
|
|
@@ -24,7 +24,12 @@
|
|
|
|
#include "libcommon.h"
|
|
|
|
+#define XKBKEYMAPDIR KEYMAPDIR "/xkb"
|
|
+#define LEGACYKEYMAPDIR KEYMAPDIR "/legacy"
|
|
+
|
|
static const char *const dirpath1[] = {
|
|
+ DATADIR "/" XKBKEYMAPDIR "/",
|
|
+ DATADIR "/" LEGACYKEYMAPDIR "/**",
|
|
DATADIR "/" KEYMAPDIR "/**",
|
|
KERNDIR "/",
|
|
NULL
|