kbd/kbd-1.15.5-loadkeys-search-path.patch
Stanislav Brabec 6d5642a65c Accepting request 836428 from home:sbrabec:branches-kbd-prefer-xkb
- Update to version 2.3.0...
- Refresh partially upstreamed kbd-1.15.2-dumpkeys-C-opt.patch
- Drop upstreamed libkeymap-Fix-mk_mapname-for-the-plain-map.patch
- Refresh kbd-1.15.2-setfont-no-cruft.patch and
  kbd-1.15.5-loadkeys-search-path.patch

OBS-URL: https://build.opensuse.org/request/show/836428
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=132
2020-09-24 00:31:03 +00:00

27 lines
782 B
Diff

Index: kbd-2.3.0/src/loadkeys.c
===================================================================
--- kbd-2.3.0.orig/src/loadkeys.c
+++ kbd-2.3.0/src/loadkeys.c
@@ -27,6 +27,8 @@
static const char *const dirpath1[] = {
"",
+ DATADIR "/" XKBKEYMAPDIR "/",
+ DATADIR "/" LEGACYKEYMAPDIR "/**",
DATADIR "/" KEYMAPDIR "/**",
KERNDIR "/",
NULL
Index: kbd-2.3.0/src/paths.h
===================================================================
--- kbd-2.3.0.orig/src/paths.h
+++ kbd-2.3.0/src/paths.h
@@ -5,6 +5,8 @@
* The following five subdirectories are defined:
*/
#define KEYMAPDIR "keymaps"
+#define XKBKEYMAPDIR "keymaps/xkb"
+#define LEGACYKEYMAPDIR "keymaps/legacy"
#define UNIMAPDIR "unimaps"
#define TRANSDIR "consoletrans"
#define VIDEOMODEDIR "videomodes"