xkeyboard-config 2.27
drop intltools, no longer needed, see upstream commit e8026f673e
This commit is contained in:
Peter Hutterer
parent
f9224b4458
commit
523cebaafd
@ -1,80 +0,0 @@
|
||||
From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
|
||||
Date: Thu, 7 Feb 2019 20:40:35 +0000
|
||||
Subject: [PATCH xkeyboard-config] Fixed broken pt layout
|
||||
|
||||
Backticks broke it, removed
|
||||
---
|
||||
symbols/pt | 56 +++++++++++++++++++++++++++---------------------------
|
||||
1 file changed, 28 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/symbols/pt b/symbols/pt
|
||||
index 73a1b7b..3ec0981 100644
|
||||
--- a/symbols/pt
|
||||
+++ b/symbols/pt
|
||||
@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
|
||||
|
||||
name[Group1]="Portuguese (Colemak)";
|
||||
|
||||
- key `<AD01>` { [ q, Q, at, Greek_OMEGA ] };
|
||||
- key `<AD02>` { [ w, W, lstroke, Lstroke ] };
|
||||
- key `<AD03>` { [ f, F, dstroke, ordfeminine ] };
|
||||
- key `<AD04>` { [ p, P, thorn, THORN ] };
|
||||
- key `<AD05>` { [ g, G, eng, ENG ] };
|
||||
- key `<AD06>` { [ j, J, dead_hook, dead_horn ] };
|
||||
- key `<AD07>` { [ l, L, lstroke, Lstroke ] };
|
||||
- key `<AD08>` { [ u, U, downarrow, uparrow ] };
|
||||
- key `<AD09>` { [ y, Y, leftarrow, yen ] };
|
||||
- key `<AD10>` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
|
||||
+ key <AD01> { [ q, Q, at, Greek_OMEGA ] };
|
||||
+ key <AD02> { [ w, W, lstroke, Lstroke ] };
|
||||
+ key <AD03> { [ f, F, dstroke, ordfeminine ] };
|
||||
+ key <AD04> { [ p, P, thorn, THORN ] };
|
||||
+ key <AD05> { [ g, G, eng, ENG ] };
|
||||
+ key <AD06> { [ j, J, dead_hook, dead_horn ] };
|
||||
+ key <AD07> { [ l, L, lstroke, Lstroke ] };
|
||||
+ key <AD08> { [ u, U, downarrow, uparrow ] };
|
||||
+ key <AD09> { [ y, Y, leftarrow, yen ] };
|
||||
+ key <AD10> { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
|
||||
|
||||
- key `<AC01>` { [ a, A, ae, AE ] };
|
||||
- key `<AC02>` { [ r, R, paragraph, registered ] };
|
||||
- key `<AC03>` { [ s, S, ssharp, section ] };
|
||||
- key `<AC04>` { [ t, T, tslash, Tslash ] };
|
||||
- key `<AC05>` { [ d, D, eth, ETH ] };
|
||||
- key `<AC06>` { [ h, H, hstroke, Hstroke ] };
|
||||
- key `<AC07>` { [ n, N, n, N ] };
|
||||
- key `<AC08>` { [ e, E, EuroSign, cent ] };
|
||||
- key `<AC09>` { [ i, I, rightarrow, idotless ] };
|
||||
- key `<AC10>` { [ o, O, oslash, Ooblique ] };
|
||||
+ key <AC01> { [ a, A, ae, AE ] };
|
||||
+ key <AC02> { [ r, R, paragraph, registered ] };
|
||||
+ key <AC03> { [ s, S, ssharp, section ] };
|
||||
+ key <AC04> { [ t, T, tslash, Tslash ] };
|
||||
+ key <AC05> { [ d, D, eth, ETH ] };
|
||||
+ key <AC06> { [ h, H, hstroke, Hstroke ] };
|
||||
+ key <AC07> { [ n, N, n, N ] };
|
||||
+ key <AC08> { [ e, E, EuroSign, cent ] };
|
||||
+ key <AC09> { [ i, I, rightarrow, idotless ] };
|
||||
+ key <AC10> { [ o, O, oslash, Ooblique ] };
|
||||
|
||||
- key `<AB01>` { [ z, Z, guillemotleft, less ] };
|
||||
- key `<AB02>` { [ x, X, guillemotright, greater ] };
|
||||
- key `<AB03>` { [ c, C, cent, copyright ] };
|
||||
- key `<AB04>` { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
|
||||
- key `<AB05>` { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
|
||||
- key `<AB08>` { [ k, K, kra, ampersand ] };
|
||||
- key `<AB07>` { [ m, M, mu, masculine ] };
|
||||
+ key <AB01> { [ z, Z, guillemotleft, less ] };
|
||||
+ key <AB02> { [ x, X, guillemotright, greater ] };
|
||||
+ key <AB03> { [ c, C, cent, copyright ] };
|
||||
+ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
|
||||
+ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
|
||||
+ key <AB08> { [ k, K, kra, ampersand ] };
|
||||
+ key <AB07> { [ m, M, mu, masculine ] };
|
||||
|
||||
- key `<CAPS>` { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
|
||||
+ key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
|
||||
};
|
||||
--
|
||||
2.21.0
|
||||
@ -1,50 +0,0 @@
|
||||
From 0fb8b664a9a49b299ac3f7851df8cd9b9121e445 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Mon, 21 Jan 2019 20:27:36 +0100
|
||||
Subject: [PATCH xkeyboard-config] Map evdev keycode KEY_ROTATE_LOCK_TOGGLE to
|
||||
XF86RotationLockToggle
|
||||
|
||||
Add XF86RotationLockToggle, to be used as mapping for evdev's
|
||||
KEY_ROTATE_LOCK_TOGGLE.
|
||||
|
||||
I've a Point of View P1006W-232 Windows tablet which actually has a
|
||||
rotate-lock toggle-button. The latest kernel correctly generates
|
||||
KEY_ROTATE_LOCK_TOGGLE events for this. So now I'm hooking up support for
|
||||
it through all the higher layers.
|
||||
|
||||
The patch for adding the RotationLockToggle keysym to xproto is here:
|
||||
https://patchwork.freedesktop.org/patch/279365/
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
keycodes/evdev | 1 +
|
||||
symbols/inet | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index dd2b865..5dcc9f6 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -286,6 +286,7 @@ default xkb_keycodes "evdev" {
|
||||
|
||||
<I372> = 372; // #define KEY_FAVORITES 364
|
||||
<I382> = 382; // #define KEY_KEYBOARD 374
|
||||
+ <I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index b97ccf2..6c9dd87 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -220,6 +220,7 @@ xkb_symbols "evdev" {
|
||||
|
||||
key <I372> { [ XF86Favorites ] };
|
||||
key <I382> { [ XF86Keyboard ] };
|
||||
+ key <I569> { [ XF86RotationLockToggle ] };
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 08723f30072fcfcee2d061271bec7d79668dc869 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri, 12 May 2017 14:37:55 +0200
|
||||
Subject: [PATCH xkeyboard-config] Map evdev keycode KEY_SOUND to
|
||||
XF86AudioPreset
|
||||
|
||||
KEY_SOUND is used on actual devices and recent xproto versions
|
||||
defines the AudioPreset keysym for this key.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
symbols/inet | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index ae1f6ee..b97ccf2 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -184,7 +184,7 @@ xkb_symbols "evdev" {
|
||||
key <I218> { [ Print ] };
|
||||
// key <I219> { [ ] }; // KEY_HP
|
||||
key <I220> { [ XF86WebCam ] };
|
||||
-// key <I221> { [ ] }; // KEY_SOUND
|
||||
+ key <I221> { [ XF86AudioPreset ] };
|
||||
// key <I222> { [ ] }; // KEY_QUESTION
|
||||
key <I223> { [ XF86Mail ] };
|
||||
key <I224> { [ XF86Messenger ] }; // KEY_CHAT
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 67b5d6bfbee52bd59f3e5dac3e0d552ed572b3b2 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri, 21 Dec 2018 11:08:08 +0100
|
||||
Subject: [PATCH xkeyboard-config] evdev/inet: Fix KEY_KEYBOARD mapping
|
||||
|
||||
KEY_KEYBOARD has an evdev-keycode value of 374 not 366. It seems that
|
||||
with the original addition of the mapping the evdev-keycode value was
|
||||
mistaken for the X scancode which is 8 higher then the evdev-keycode
|
||||
since the X scancodes start at 8. What seems to have happened is that
|
||||
the evdev-keycode was used instead of the X scancode and then 8 was
|
||||
subtracted for the wrong "// #define KEY_KEYBOARD 366" comment.
|
||||
|
||||
This commit corrects the comment to say 374 and corrects the X
|
||||
scancode being mapped to 382.
|
||||
|
||||
Cc: Christian Kellner <christian@kellner.me>
|
||||
Reviewed-by: Christian Kellner <christian@kellner.me>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
keycodes/evdev | 2 +-
|
||||
symbols/inet | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index 90b8278..dd2b865 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -285,7 +285,7 @@ default xkb_keycodes "evdev" {
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
<I372> = 372; // #define KEY_FAVORITES 364
|
||||
- <I374> = 374; // #define KEY_KEYBOARD 366
|
||||
+ <I382> = 382; // #define KEY_KEYBOARD 374
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 8e65c5e..ae1f6ee 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -219,7 +219,7 @@ xkb_symbols "evdev" {
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
key <I372> { [ XF86Favorites ] };
|
||||
- key <I374> { [ XF86Keyboard ] };
|
||||
+ key <I382> { [ XF86Keyboard ] };
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
--
|
||||
2.21.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (xkeyboard-config-2.26.tar.bz2) = 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
|
||||
SHA512 (xkeyboard-config-2.27.tar.bz2) = ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
Summary: X Keyboard Extension configuration data
|
||||
Name: xkeyboard-config
|
||||
Version: 2.26
|
||||
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
Version: 2.27
|
||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
License: MIT
|
||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||
|
||||
@ -19,15 +19,9 @@ Source2: commitid
|
||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
|
||||
%endif
|
||||
|
||||
Patch01: 0001-evdev-inet-Fix-KEY_KEYBOARD-mapping.patch
|
||||
Patch02: 0001-Fixed-broken-pt-layout.patch
|
||||
Patch03: 0001-Map-evdev-keycode-KEY_ROTATE_LOCK_TOGGLE-to-XF86Rota.patch
|
||||
Patch04: 0001-Map-evdev-keycode-KEY_SOUND-to-XF86AudioPreset.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext gettext-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: perl(XML::Parser)
|
||||
@ -58,7 +52,7 @@ Development files for %{name}.
|
||||
%autosetup -S git
|
||||
|
||||
%build
|
||||
AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
|
||||
autoreconf -v --force --install || exit 1
|
||||
%configure \
|
||||
--enable-compat-rules \
|
||||
--with-xkb-base=%{_datadir}/X11/xkb \
|
||||
@ -93,6 +87,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||
|
||||
%changelog
|
||||
* Thu Jun 13 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.27-1
|
||||
- xkeyboard-config 2.27
|
||||
- drop intltool, no longer needed, see upstream commit e8026f673e
|
||||
|
||||
* Mon May 27 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.26-2
|
||||
- xkeyboard-config 2.26, with sources this time
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user