From f4e6b996a015a8c8a11e5fb81d32ceb2f3272813ea44a99d365714abfea0382b Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 17 Sep 2020 15:08:53 +0000 Subject: [PATCH] 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 --- kbd-1.15.5-loadkeys-search-path.patch | 2 +- kbd.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch index 7bb5edf..e6565a8 100644 --- a/kbd-1.15.5-loadkeys-search-path.patch +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -7,7 +7,7 @@ Index: kbd-2.2.0/src/loadkeys.c #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 dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static void __attribute__((noreturn)) diff --git a/kbd.changes b/kbd.changes index 3fd4cf5..0188381 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec + +- 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