Accepting request 835237 from home:sbrabec:branches-kbd-prefer-xkb

- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
  (boo#1176302).

OBS-URL: https://build.opensuse.org/request/show/835237
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=127
This commit is contained in:
Stanislav Brabec 2020-09-17 15:08:53 +00:00 committed by Git OBS Bridge
parent 5a8c87771d
commit f4e6b996a0
2 changed files with 7 additions and 1 deletions

View File

@ -7,7 +7,7 @@ Index: kbd-2.2.0/src/loadkeys.c
#include "keymap.h" #include "keymap.h"
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; -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 dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn)) static void __attribute__((noreturn))

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
(boo#1176302).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <jslaby@suse.com> Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <jslaby@suse.com>