Blame kbd-1.15.5-loadkeys-search-path.patch
|
 |
70af662 |
diff -up kbd-2.1.0/src/loadkeys.c.orig kbd-2.1.0/src/loadkeys.c
|
|
|
70af662 |
--- kbd-2.1.0/src/loadkeys.c.orig 2019-07-15 10:57:18.000000000 +0200
|
|
|
70af662 |
+++ kbd-2.1.0/src/loadkeys.c 2019-07-17 14:34:51.224525616 +0200
|
|
|
70af662 |
@@ -24,7 +24,7 @@
|
|
|
70af662 |
#include "paths.h"
|
|
|
b1baa32 |
#include "keymap.h"
|
|
|
b1baa32 |
|
|
|
b1baa32 |
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
|
|
|
b1baa32 |
+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
|
|
|
b1baa32 |
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
|
|
|
b1baa32 |
|
|
|
0bbc1fa |
static void __attribute__((noreturn))
|
|
|
70af662 |
diff -up kbd-2.1.0/src/paths.h.orig kbd-2.1.0/src/paths.h
|
|
|
70af662 |
--- kbd-2.1.0/src/paths.h.orig 2019-05-07 11:21:10.000000000 +0200
|
|
|
70af662 |
+++ kbd-2.1.0/src/paths.h 2019-07-17 14:35:13.870574558 +0200
|
|
|
b1baa32 |
@@ -5,6 +5,8 @@
|
|
|
b1baa32 |
* The following five subdirectories are defined:
|
|
|
b1baa32 |
*/
|
|
|
b1baa32 |
#define KEYMAPDIR "keymaps"
|
|
|
b1baa32 |
+#define XKBKEYMAPDIR "keymaps/xkb"
|
|
|
b1baa32 |
+#define LEGACYKEYMAPDIR "keymaps/legacy"
|
|
|
b1baa32 |
#define UNIMAPDIR "unimaps"
|
|
|
b1baa32 |
#define TRANSDIR "consoletrans"
|
|
|
b1baa32 |
#define VIDEOMODEDIR "videomodes"
|