xkeyboard-config 2.38
This commit is contained in:
Peter Hutterer
parent
0e577ed626
commit
a508b434e1
@ -1,57 +0,0 @@
|
|||||||
From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
|
||||||
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 <bensberg@telfort.nl>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From dc1534b4b0cf2153e4b8848310efc8393fb73830 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
|
||||||
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 <bensberg@telfort.nl>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
72
447.patch
72
447.patch
@ -1,72 +0,0 @@
|
|||||||
From 2433ef1aaa77b7911917b696918f2981ed5aa7ba Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Stone <daniels@collabora.com>
|
|
||||||
Date: Thu, 17 Mar 2022 15:14:49 -0400
|
|
||||||
Subject: [PATCH] Add apple:jp_oadg109a and apple:jp_pc106 variants
|
|
||||||
|
|
||||||
These variants allow Apple MacBook keyboards to type \ properly.
|
|
||||||
|
|
||||||
Co-authored-by: Hector Martin <marcan@marcan.st>
|
|
||||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
|
||||||
---
|
|
||||||
rules/0042-o_s.part | 2 ++
|
|
||||||
rules/base.xml | 12 ++++++++++++
|
|
||||||
symbols/macintosh_vndr/apple | 10 ++++++++++
|
|
||||||
3 files changed, 24 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part
|
|
||||||
index 5fa7849a..75bf7730 100644
|
|
||||||
--- a/rules/0042-o_s.part
|
|
||||||
+++ b/rules/0042-o_s.part
|
|
||||||
@@ -159,6 +159,8 @@
|
|
||||||
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
|
|
||||||
keypad:pointerkeys = +keypad(pointerkeys)
|
|
||||||
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
|
|
||||||
+ apple:jp_pc106 = +macintosh_vndr/apple(jp_pc106)
|
|
||||||
+ apple:jp_oadg109a = +macintosh_vndr/apple(jp_oadg109a)
|
|
||||||
shift:both_capslock = +shift(both_capslock)
|
|
||||||
shift:lshift_both_capslock = +shift(lshift_both_capslock)
|
|
||||||
shift:rshift_both_capslock = +shift(rshift_both_capslock)
|
|
||||||
diff --git a/rules/base.xml b/rules/base.xml
|
|
||||||
index eff2f941..75195b64 100644
|
|
||||||
--- a/rules/base.xml
|
|
||||||
+++ b/rules/base.xml
|
|
||||||
@@ -7833,6 +7833,18 @@
|
|
||||||
<description>Apple Aluminium emulates Pause, PrtSc, Scroll Lock</description>
|
|
||||||
</configItem>
|
|
||||||
</option>
|
|
||||||
+ <option>
|
|
||||||
+ <configItem>
|
|
||||||
+ <name>apple:jp_oadg109a</name>
|
|
||||||
+ <description>Japanese Apple keyboards emulate OADG109A backslash</description>
|
|
||||||
+ </configItem>
|
|
||||||
+ </option>
|
|
||||||
+ <option>
|
|
||||||
+ <configItem>
|
|
||||||
+ <name>apple:jp_pc106</name>
|
|
||||||
+ <description>Japanese Apple keyboards emulate PC106 backslash</description>
|
|
||||||
+ </configItem>
|
|
||||||
+ </option>
|
|
||||||
<option>
|
|
||||||
<configItem>
|
|
||||||
<name>shift:breaks_caps</name>
|
|
||||||
diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
|
|
||||||
index 342eb7db..f74a71fd 100644
|
|
||||||
--- a/symbols/macintosh_vndr/apple
|
|
||||||
+++ b/symbols/macintosh_vndr/apple
|
|
||||||
@@ -139,3 +139,13 @@ xkb_symbols "alupckeys" {
|
|
||||||
};
|
|
||||||
override key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+partial
|
|
||||||
+xkb_symbols "jp_oadg109a" {
|
|
||||||
+ replace key <AB11> { [ backslash, underscore ] };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+partial
|
|
||||||
+xkb_symbols "jp_pc106" {
|
|
||||||
+ replace key <AB11> { [ backslash, bar ] };
|
|
||||||
+};
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (xkeyboard-config-2.36.tar.xz) = a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
|
SHA512 (xkeyboard-config-2.38.tar.xz) = 20848a5a10cfa58265518add796fd97ddd2e39e7a87b18170cd9ebc3ec87268e92641f2cd8aaed1ed80cdbe3801b65a8a916321ffc20a419511b3d2a85b0dd2a
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
Summary: X Keyboard Extension configuration data
|
Summary: X Keyboard Extension configuration data
|
||||||
Name: xkeyboard-config
|
Name: xkeyboard-config
|
||||||
Version: 2.36
|
Version: 2.38
|
||||||
Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||||
|
|
||||||
@ -19,13 +19,6 @@ Source2: commitid
|
|||||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
|
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
|
||||||
%endif
|
%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
|
|
||||||
|
|
||||||
# Add apple:jp_oadg109a and apple:jp_pc106 variants
|
|
||||||
Patch03: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/447.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: gettext gettext-devel
|
BuildRequires: gettext gettext-devel
|
||||||
@ -85,6 +78,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
|||||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 07 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.38-1
|
||||||
|
- xkeyboard-config 2.38
|
||||||
|
|
||||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-4
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user