mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-27 18:40:51 +00:00
xkeyboard-config: updated to 2.34
- dropped patches fixed by xkbcomp pkg bump
This commit is contained in:
SupervisedThinking
parent
7f48793455
commit
4351cf377e
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xkeyboard-config"
|
||||
PKG_VERSION="2.31"
|
||||
PKG_SHA256="da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3"
|
||||
PKG_VERSION="2.34"
|
||||
PKG_SHA256="b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://www.X.org"
|
||||
PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
From 5bb6d783f40d8aa61da2095c08a6933bb1ee7bf3 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Boll <aboll@debian.org>
|
||||
Date: Sun, 16 Feb 2020 02:35:03 +0000
|
||||
Subject: [PATCH 2/3] Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard"
|
||||
|
||||
This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
|
||||
|
||||
This patch breaks keyboard layouts in XWayland applications when having several
|
||||
keyboard layouts enabled.
|
||||
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020
|
||||
|
||||
Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
|
||||
dependency on x11-xkb-utils.
|
||||
---
|
||||
keycodes/evdev | 1 -
|
||||
symbols/inet | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index d41799d..e08ea0a 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -285,9 +285,8 @@ default xkb_keycodes "evdev" {
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
<I372> = 372; // #define KEY_FAVORITES 364
|
||||
<I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
- <I382> = 382; // #define KEY_KEYBOARD 374
|
||||
<I442> = 442; // #define KEY_DOLLAR 434
|
||||
<I443> = 443; // #define KEY_EURO 435
|
||||
<I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 5ab6feb..72cc45d 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -219,9 +219,8 @@ xkb_symbols "evdev" {
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
key <I372> { [ XF86Favorites ] };
|
||||
key <I380> { [ XF86FullScreen ] };
|
||||
- key <I382> { [ XF86Keyboard ] };
|
||||
key <I442> { [ dollar ] };
|
||||
key <I443> { [ EuroSign ] };
|
||||
key <I569> { [ XF86RotationLockToggle ] };
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From 9415d810808061cbb38832c4abf636606f3ed2ad Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Boll <aboll@debian.org>
|
||||
Date: Sun, 16 Feb 2020 02:35:56 +0000
|
||||
Subject: [PATCH 3/3] Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites"
|
||||
|
||||
This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
|
||||
|
||||
This patch breaks keyboard layouts in XWayland applications when having
|
||||
several keyboard layouts enabled.
|
||||
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940
|
||||
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020
|
||||
|
||||
Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
|
||||
dependency on x11-xkb-utils.
|
||||
---
|
||||
keycodes/evdev | 1 -
|
||||
symbols/inet | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index e08ea0a..8ed0fa9 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,7 +284,6 @@ default xkb_keycodes "evdev" {
|
||||
<I254> = 254; // #define KEY_WWAN 246
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
- <I372> = 372; // #define KEY_FAVORITES 364
|
||||
<I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
<I442> = 442; // #define KEY_DOLLAR 434
|
||||
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 72cc45d..2a5ab74 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,7 +218,6 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I372> { [ XF86Favorites ] };
|
||||
key <I380> { [ XF86FullScreen ] };
|
||||
key <I442> { [ dollar ] };
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From 9d3629f7a6edce20990ca75d879097abe62bc8a7 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Sun, 16 Feb 2020 02:51:52 +0000
|
||||
Subject: [PATCH] drop unsupported keycodes
|
||||
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: The XKEYBOARD keymap compiler (xkbcomp) reports:
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: > Warning: Unsupported high keycode 569 for name <I569> ignored
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: > X11 cannot support keycodes above 255.
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: > This warning only shows for the first high keycode.
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: > Internal error: Could not resolve keysym XF86RotationLockToggle
|
||||
Jun 14 00:55:54 NUC xorg-launch[722]: Errors from xkbcomp are not fatal to the X server
|
||||
---
|
||||
keycodes/evdev | 3 ---
|
||||
symbols/inet | 3 ---
|
||||
2 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index 8ed0fa9..f7d5c7b 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,11 +284,8 @@ default xkb_keycodes "evdev" {
|
||||
<I254> = 254; // #define KEY_WWAN 246
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
- <I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
<I442> = 442; // #define KEY_DOLLAR 434
|
||||
<I443> = 443; // #define KEY_EURO 435
|
||||
- <I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
-
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
<MDSW> = 203;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 2a5ab74..0fb78cd 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,11 +218,8 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I380> { [ XF86FullScreen ] };
|
||||
key <I442> { [ dollar ] };
|
||||
key <I443> { [ EuroSign ] };
|
||||
- key <I569> { [ XF86RotationLockToggle ] };
|
||||
-
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
key <FK15> { [ XF86Launch6 ] };
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user