rpm/kbd
SHA256
1
0
Fork 0
forked from pool/kbd
Code Pull Requests Activity
93a30b004f
kbd/kbd-1.15.5-loadkeys-search-path.patch

27 lines
1.0 KiB
Diff
Raw Normal View History

Accepting request 528635 from home:sbrabec:branches:kbd-1056449 - Version update to 2.0.6: * translation updates * support for U+202F * minor fixes and code cleanup * minor improvements and more characters support - Enable vlock (bsc#1056449, FATE#261). OBS-URL: https://build.opensuse.org/request/show/528635 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=94
2017-09-27 20:52:42 +02:00
Index: kbd-2.0.4/src/loadkeys.c
===================================================================
--- kbd-2.0.4.orig/src/loadkeys.c
+++ kbd-2.0.4/src/loadkeys.c
@@ -27,7 +27,7 @@
Accepting request 321596 from home:sndirsch:fate318355 - 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
2015-08-13 16:03:32 +02:00
#include "keymap.h"
Accepting request 528635 from home:sbrabec:branches:kbd-1056449 - Version update to 2.0.6: * translation updates * support for U+202F * minor fixes and code cleanup * minor improvements and more characters support - Enable vlock (bsc#1056449, FATE#261). OBS-URL: https://build.opensuse.org/request/show/528635 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=94
2017-09-27 20:52:42 +02:00
static const char *progname = NULL;
Accepting request 321596 from home:sndirsch:fate318355 - 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
2015-08-13 16:03:32 +02:00
-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 };
Accepting request 528635 from home:sbrabec:branches:kbd-1056449 - Version update to 2.0.6: * translation updates * support for U+202F * minor fixes and code cleanup * minor improvements and more characters support - Enable vlock (bsc#1056449, FATE#261). OBS-URL: https://build.opensuse.org/request/show/528635 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=94
2017-09-27 20:52:42 +02:00
static void __attribute__((noreturn))
Index: kbd-2.0.4/src/paths.h
===================================================================
--- kbd-2.0.4.orig/src/paths.h
+++ kbd-2.0.4/src/paths.h
Accepting request 321596 from home:sndirsch:fate318355 - 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
2015-08-13 16:03:32 +02:00
@@ -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"
Copy Permalink