From 1392cb9cd018eea2d843a1966fe3ce5a362135f1 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 24 Aug 2023 11:30:12 +0200 Subject: [PATCH] Update to kbd-2.6.2, remove unused patch, version obsoletes Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 +- ...-codepoint-character-that-chokes-loa.patch | 30 ------------------- kbd-1.15.5-loadkeys-search-path.patch | 16 +++++----- kbd.spec | 10 +++++-- sources | 2 +- 5 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 0001-fa.map-drop-high-codepoint-character-that-chokes-loa.patch diff --git a/.gitignore b/.gitignore index 64c3186..9b7cb5b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ terminus.tar.bz2 /fr-dvorak.tar.bz2 /kbd-latarcyrheb-32.tar.bz2 /kbdinfo.1 -/kbd-2.6.1.tar.xz +/kbd-2.6.2.tar.xz diff --git a/0001-fa.map-drop-high-codepoint-character-that-chokes-loa.patch b/0001-fa.map-drop-high-codepoint-character-that-chokes-loa.patch deleted file mode 100644 index 7d185eb..0000000 --- a/0001-fa.map-drop-high-codepoint-character-that-chokes-loa.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d8aa08c7f3096fbb2901d1b9f93473ca9ba1d342 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 21 Oct 2021 14:08:24 -0700 -Subject: [PATCH] fa.map: drop high codepoint character that chokes loadkeys - -fa.map contains a mapping for Unicode character U+FDFC. However, -loadkeys refuses to load any map containing a codepoint over -U+F000. To avoid the map failing to load entirely, let's remove -the problematic character. - -Signed-off-by: Adam Williamson ---- - data/keymaps/i386/qwerty/fa.map | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/keymaps/i386/qwerty/fa.map b/data/keymaps/i386/qwerty/fa.map -index 9ea0a7a..9aa5284 100644 ---- a/data/keymaps/i386/qwerty/fa.map -+++ b/data/keymaps/i386/qwerty/fa.map -@@ -44,7 +44,6 @@ altgr keycode 57 = U+0020 # SPACE - altgr shift keycode 2 = U+0021 # EXCLAMATION MARK - altgr shift keycode 40 = U+061B # ARABIC SEMICOLON - altgr shift keycode 4 = U+066B # ARABIC DECIMAL SEPARATOR --altgr shift keycode 5 = U+FDFC # RIAL SIGN - altgr shift keycode 6 = U+066A # ARABIC PERCENT SIGN - altgr shift keycode 8 = U+060C # ARABIC COMMA - altgr keycode 40 = U+06AF # ARABIC LETTER GAF --- -2.33.0 - diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch index 16beb3d..aeb771c 100644 --- a/kbd-1.15.5-loadkeys-search-path.patch +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -1,18 +1,18 @@ -diff -up kbd-2.3.0/src/loadkeys.c.orig kbd-2.3.0/src/loadkeys.c ---- kbd-2.3.0/src/loadkeys.c.orig 2020-06-02 12:16:45.000000000 +0200 -+++ kbd-2.3.0/src/loadkeys.c 2020-07-16 09:02:50.398864688 +0200 -@@ -28,6 +28,8 @@ +diff -up kbd-2.6.2/src/loadkeys.c.orig kbd-2.6.2/src/loadkeys.c +--- kbd-2.6.2/src/loadkeys.c.orig 2023-08-22 10:02:52.261785310 +0200 ++++ kbd-2.6.2/src/loadkeys.c 2023-08-22 10:03:44.351889761 +0200 +@@ -27,6 +27,8 @@ + static const char *const dirpath1[] = { - "", DATADIR "/" KEYMAPDIR "/**", + DATADIR "/" XKBKEYMAPDIR "/", + DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", NULL }; -diff -up kbd-2.3.0/src/paths.h.orig kbd-2.3.0/src/paths.h ---- kbd-2.3.0/src/paths.h.orig 2020-07-16 09:02:59.243010909 +0200 -+++ kbd-2.3.0/src/paths.h 2020-07-16 09:03:23.446410942 +0200 +diff -up kbd-2.6.2/src/paths.h.orig kbd-2.6.2/src/paths.h +--- kbd-2.6.2/src/paths.h.orig 2023-08-22 10:04:03.021927193 +0200 ++++ kbd-2.6.2/src/paths.h 2023-08-22 10:04:35.740992805 +0200 @@ -5,6 +5,8 @@ * The following five subdirectories are defined: */ diff --git a/kbd.spec b/kbd.spec index ed3a6ab..52c7291 100644 --- a/kbd.spec +++ b/kbd.spec @@ -4,8 +4,8 @@ %global kbd_datadir %{_exec_prefix}/lib/kbd Name: kbd -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) License: GPL-2.0-or-later URL: http://www.kbd-project.org/ @@ -42,7 +42,7 @@ Requires: %{name}-legacy = %{version}-%{release} Conflicts: filesystem < 3 Provides: vlock = %{version} Conflicts: vlock <= 1.3 -Obsoletes: vlock +Obsoletes: vlock < 1.3-34 %description The %{name} package contains tools for managing a Linux @@ -183,6 +183,10 @@ make check %{kbd_datadir}/keymaps/legacy %changelog +* Thu Aug 24 2023 Vitezslav Crhonek - 2.6.2-1 +- Update to kbd-2.6.2 + Resolves: #2232126 + * Thu Jul 20 2023 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 03f5008..25aeee8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584 SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8 SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99 -SHA512 (kbd-2.6.1.tar.xz) = 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 +SHA512 (kbd-2.6.2.tar.xz) = afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2