Stanislav Brabec
37635f4779
- Update to version 2.2.0... OBS-URL: https://build.opensuse.org/request/show/781285 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=121
27 lines
1011 B
Diff
27 lines
1011 B
Diff
Index: kbd-2.2.0/src/loadkeys.c
|
|
===================================================================
|
|
--- kbd-2.2.0.orig/src/loadkeys.c
|
|
+++ kbd-2.2.0/src/loadkeys.c
|
|
@@ -24,7 +24,7 @@
|
|
#include "paths.h"
|
|
#include "keymap.h"
|
|
|
|
-static const char *const dirpath1[] = { "", 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 void __attribute__((noreturn))
|
|
Index: kbd-2.2.0/src/paths.h
|
|
===================================================================
|
|
--- kbd-2.2.0.orig/src/paths.h
|
|
+++ kbd-2.2.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"
|