fc229be082
- genmap4systemd.sh: use 'abnt2' model for 'br' layouts, 'jp106'
model for 'jp' layouts and 'microsoftpro' for anything else
(instead of 'pc105' before) (FATE#318426)
- added genmap4systemd.sh tool, which generates entries for
systemd's /usr/share/systemd/kbd-model-map table from
xkeyboard-config converted keymaps; entries are written to
/usr/share/systemd/kbd-model-map.xkb-generated, so these can
easily be added to /usr/share/systemd/kbd-model-map by systemd
package (FATE#318426)
- Include xkb layouts from xkeyboard-config converted to console
keymaps, (FATE#318426)
* Rename Finnish xkb converted layout
* Add xkb and legacy keymaps subdirs to loadkyes search path,
remove symlinks, Don't convert layouts that can't input ASCII,
* Original keymaps moved to legacy dir, created symlinks to xkb
keymaps
OBS-URL: https://build.opensuse.org/request/show/321596
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=77
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff -up kbd-2.0.1/src/loadkeys.c.orig kbd-2.0.1/src/loadkeys.c
|
|
--- kbd-2.0.1/src/loadkeys.c.orig 2013-11-27 12:56:57.846069007 +0100
|
|
+++ kbd-2.0.1/src/loadkeys.c 2013-11-27 12:58:03.877302345 +0100
|
|
@@ -26,7 +26,7 @@
|
|
#include "keymap.h"
|
|
|
|
static const char *progname = NULL;
|
|
-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))
|
|
diff -up kbd-2.0.1/src/paths.h.orig kbd-2.0.1/src/paths.h
|
|
--- kbd-2.0.1/src/paths.h.orig 2013-11-27 12:58:10.662326108 +0100
|
|
+++ kbd-2.0.1/src/paths.h 2013-11-27 12:58:32.566403015 +0100
|
|
@@ -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"
|