xkeyboard-config 2.24
This commit is contained in:
Peter Hutterer
parent
4c9ee365c2
commit
c327c76b0c
1
.gitignore
vendored
1
.gitignore
vendored
@ -30,3 +30,4 @@ xkeyboard-config-1.9.tar.bz2
|
||||
/xkeyboard-config-2.22.tar.bz2
|
||||
/xkeyboard-config-2.23.tar.bz2
|
||||
/xkeyboard-config-2.23.1.tar.bz2
|
||||
/xkeyboard-config-2.24.tar.bz2
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From dbaf3d9ce3bf3ccdfaff44a5f340b9980bd5052e 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] Add evdev mappings for KEY_SOUND, KEY_UWB,
|
||||
KEY_WWAN and KEY_RFKILL
|
||||
|
||||
KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
|
||||
current xproto master defines keysyms for these. Add mappings for
|
||||
these keys.
|
||||
|
||||
The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
|
||||
evdev code for it, so lets adds a mapping for that too.
|
||||
|
||||
Note that this replaces the I255 to XF86Hibernate mapping in
|
||||
xkb_symbols "evdev", I don't know where that came from, but it is
|
||||
wrong, I255 was until now not defined in keycodes/evdev and
|
||||
KEY_HIBERNATE is not defined in linux/input-event-codes.h .
|
||||
|
||||
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
|
||||
Cc: Bastien Nocera <bnocera@redhat.com>
|
||||
Cc: Benjamin Berg <bberg@redhat.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
keycodes/evdev | 2 ++
|
||||
symbols/inet | 7 ++++---
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index 624ac68..51a6e26 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
|
||||
<I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
|
||||
<I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
|
||||
<I253> = 253; // #define KEY_DISPLAY_OFF 245
|
||||
+ <I254> = 254; // #define KEY_WWAN 246
|
||||
+ <I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 5403e77..1e06aa9 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
|
||||
@@ -210,13 +210,14 @@ xkb_symbols "evdev" {
|
||||
key <I244> { [ XF86Battery ] };
|
||||
key <I245> { [ XF86Bluetooth ] };
|
||||
key <I246> { [ XF86WLAN ] };
|
||||
+ key <I247> { [ XF86UWB ] };
|
||||
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
|
||||
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
|
||||
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
|
||||
// key <I252> { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off
|
||||
// key <I253> { [ ] }; // KEY_DISPLAY_OFF -- turn off display
|
||||
-// key <I254> { [ ] }; // KEY_WIMAX
|
||||
- key <I255> { [ XF86Hibernate ] }; // KEY_HIBERNATE
|
||||
+ key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
+ key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
--
|
||||
2.12.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
|
||||
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
|
||||
Date: Thu, 1 Feb 2018 15:37:46 +0100
|
||||
Subject: [PATCH xkeyboard-config] Fix typo in Polish symbols file
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=104904
|
||||
---
|
||||
symbols/pl | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/symbols/pl b/symbols/pl
|
||||
index 52e7959..800cb85 100644
|
||||
--- a/symbols/pl
|
||||
+++ b/symbols/pl
|
||||
@@ -497,7 +497,6 @@ partial alphanumeric_keys
|
||||
include "sun_vndr/pl(sun_type6)"
|
||||
};
|
||||
|
||||
-------------------------------
|
||||
//Glagolica
|
||||
partial alphanumeric_keys
|
||||
xkb_symbols "glagolica"
|
||||
--
|
||||
2.14.3
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (xkeyboard-config-2.23.1.tar.bz2) = d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
|
||||
SHA512 (xkeyboard-config-2.24.tar.bz2) = 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
Summary: X Keyboard Extension configuration data
|
||||
Name: xkeyboard-config
|
||||
Version: 2.23.1
|
||||
Version: 2.24
|
||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
License: MIT
|
||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||
@ -19,10 +19,6 @@ Source2: commitid
|
||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
|
||||
%endif
|
||||
|
||||
# Submitted upstream
|
||||
Patch1: 0001-Add-evdev-mappings-for-KEY_SOUND-KEY_UWB-KEY_WWAN-an.patch
|
||||
Patch2: 0001-Fix-typo-in-Polish-symbols-file.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: gettext
|
||||
@ -92,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||
|
||||
%changelog
|
||||
* Tue Jun 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-1
|
||||
- xkeyboard-config 2.24
|
||||
|
||||
* Wed Feb 07 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23.1-1
|
||||
- Fix typo in polish keyboard layout
|
||||
- xkeyboard-config 2.23.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user