From 6924f93c0ca9cbeab002fa32ad25cc786e5adc7e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 16 Jun 2022 10:58:19 +1000 Subject: [PATCH] xkeyboard-config 2.36 --- ...ashes-instead-of-slashes-for-line-co.patch | 57 +++++++++++++++++++ ...-rules-that-reference-two-sections-t.patch | 41 +++++++++++++ sources | 2 +- xkeyboard-config.spec | 9 ++- 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 0001-rules-use-backslashes-instead-of-slashes-for-line-co.patch create mode 100644 0002-rules-remove-two-rules-that-reference-two-sections-t.patch diff --git a/0001-rules-use-backslashes-instead-of-slashes-for-line-co.patch b/0001-rules-use-backslashes-instead-of-slashes-for-line-co.patch new file mode 100644 index 0000000..c3355f0 --- /dev/null +++ b/0001-rules-use-backslashes-instead-of-slashes-for-line-co.patch @@ -0,0 +1,57 @@ +From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Fri, 10 Jun 2022 12:05:52 +0200 +Subject: [PATCH xkeyboard-config] rules: use backslashes instead of slashes + for line continuation :\ + +This fixes #324. + +Reported-by: Adriaan de Groot + +Bug existed since commit c3c5d02a7e from six weeks ago. + +Signed-off-by: Benno Schulenberg +--- + rules/0002-base.lists.part | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part +index 0af6db56..cb661240 100644 +--- a/rules/0002-base.lists.part ++++ b/rules/0002-base.lists.part +@@ -37,18 +37,18 @@ + unitekkb1925 yahoo + + ! $inetmediakbds = \ +- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop / +- armada asus_laptop benqx btc5090 btc6301urf btc9019u / +- cherrybluea cherryblueb cherrycyboard chicony042 / +- compalfl90 compaqik13 compaqik18 creativedw7000 / +- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 / +- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy / +- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf / +- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude / +- logidinovo logidinovoedge logitech_base logitech_g15 / +- microsoft4000 microsoft7000 microsoftmult microsoftpro / +- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m / +- presario propeller samsung4500 samsung4510 scorpius / +- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 / +- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 / ++ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \ ++ armada asus_laptop benqx btc5090 btc6301urf btc9019u \ ++ cherrybluea cherryblueb cherrycyboard chicony042 \ ++ compalfl90 compaqik13 compaqik18 creativedw7000 \ ++ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \ ++ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \ ++ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \ ++ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \ ++ logidinovo logidinovoedge logitech_base logitech_g15 \ ++ microsoft4000 microsoft7000 microsoftmult microsoftpro \ ++ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \ ++ presario propeller samsung4500 samsung4510 scorpius \ ++ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \ ++ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \ + toshiba_s3000 trust trustda trust_slimline unitekkb1925 +-- +2.36.1 + diff --git a/0002-rules-remove-two-rules-that-reference-two-sections-t.patch b/0002-rules-remove-two-rules-that-reference-two-sections-t.patch new file mode 100644 index 0000000..5bd3917 --- /dev/null +++ b/0002-rules-remove-two-rules-that-reference-two-sections-t.patch @@ -0,0 +1,41 @@ +From dc1534b4b0cf2153e4b8848310efc8393fb73830 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Sun, 12 Jun 2022 12:05:20 +0200 +Subject: [PATCH xkeyboard-config] rules: remove two rules that reference two + sections that were deleted + +Commit fe36f31e8c from three months ago removed the need for special +aliases and key assignments for applealu_jis keyboards but forgot to +remove the two rules that reference these sections. + +This fixes issue #325. + +Signed-off-by: Benno Schulenberg +--- + rules/0004-evdev.m_k.part | 1 - + rules/0026-evdev.m_s.part | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.m_k.part +index 1cff7b2f..62c21ffc 100644 +--- a/rules/0004-evdev.m_k.part ++++ b/rules/0004-evdev.m_k.part +@@ -1,5 +1,4 @@ + ! model = keycodes +- applealu_jis = evdev+macintosh(jisevdev) + $jollamodels = evdev+jolla(jolla) + olpc = evdev+olpc(olpc) + olpcm = evdev+olpc(olpcm) +diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.m_s.part +index 2dd72051..80067025 100644 +--- a/rules/0026-evdev.m_s.part ++++ b/rules/0026-evdev.m_s.part +@@ -2,5 +2,4 @@ + $evdevkbds = +inet(evdev)+inet(%m) + chromebook = +inet(evdev)+inet(chromebook) + ppkb = +inet(evdev)+inet(ppkb) +- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) + * = +inet(evdev) +-- +2.36.1 + diff --git a/sources b/sources index fc5e4de..669afc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xkeyboard-config-2.35.1.tar.xz) = 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94 +SHA512 (xkeyboard-config-2.36.tar.xz) = a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index bb1b16e..597f4f1 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,7 +6,7 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.35.1 +Version: 2.36 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,6 +19,10 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz %endif +# Both upstream already +Patch01: 0001-rules-use-backslashes-instead-of-slashes-for-line-co.patch +Patch02: 0002-rules-remove-two-rules-that-reference-two-sections-t.patch + BuildArch: noarch BuildRequires: gettext gettext-devel @@ -78,6 +82,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu Jun 16 2022 Peter Hutterer - 2.36-1 +- xkeyboard-config 2.36 + * Wed Feb 09 2022 Peter Hutterer - 2.35.1-1 - xkeyboard-config 2.35.1