mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
106 lines
3.7 KiB
Diff
106 lines
3.7 KiB
Diff
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
|
|
|