mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
xkeyboard-config: update to xkeyboard-config-2.29
This commit is contained in:
MilhouseVH
parent
31a91ccaad
commit
e86d9c4612
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xkeyboard-config"
|
||||
PKG_VERSION="2.27"
|
||||
PKG_SHA256="690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f"
|
||||
PKG_VERSION="2.29"
|
||||
PKG_SHA256="1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802"
|
||||
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,23 +1,26 @@
|
||||
commit a77adbe8d56dcaf4a138aa4026134e2869aa61cb
|
||||
Author: Andreas Boll <aboll@debian.org>
|
||||
Date: Mon Feb 11 14:00:49 2019 +0100
|
||||
From 02d24ce4001d2ef9c821566867599f41fbc3d1d1 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Boll <aboll@debian.org>
|
||||
Date: Sun, 16 Feb 2020 02:34:56 +0000
|
||||
Subject: [PATCH 1/3] Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to
|
||||
XF86MonBrightnessCycle"
|
||||
|
||||
Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to XF86MonBrightnessCycle"
|
||||
This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458.
|
||||
|
||||
This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458.
|
||||
XF86MonBrightnessCycle currently depends on an unreleased xorgproto.
|
||||
|
||||
XF86MonBrightnessCycle currently depends on an unreleased xorgproto.
|
||||
See also
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/123
|
||||
https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/4e9f4e6136a7c35b0b3d341424eb4e0585f2f0a7
|
||||
|
||||
See also
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/123
|
||||
https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/4e9f4e6136a7c35b0b3d341424eb4e0585f2f0a7
|
||||
|
||||
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
|
||||
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
|
||||
---
|
||||
symbols/inet | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 8e65c5e5..4d774fac 100644
|
||||
index 049ac18..5ab6feb 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -212,7 +212,7 @@ xkb_symbols "evdev" {
|
||||
@ -29,28 +32,35 @@ index 8e65c5e5..4d774fac 100644
|
||||
// key <I252> { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off
|
||||
// key <I253> { [ ] }; // KEY_DISPLAY_OFF -- turn off display
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
commit 0ea1d601ee56e1eb81be5f0a740e1380735e11ac
|
||||
Author: Andreas Boll <aboll@debian.org>
|
||||
Date: Mon Feb 11 14:48:08 2019 +0100
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard"
|
||||
|
||||
This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
|
||||
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 patch breaks keyboard layouts in XWayland applications when having several
|
||||
keyboard layouts enabled.
|
||||
This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
|
||||
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
This patch breaks keyboard layouts in XWayland applications when having several
|
||||
keyboard layouts enabled.
|
||||
|
||||
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
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
|
||||
Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
|
||||
dependency on x11-xkb-utils.
|
||||
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 90b8278d..f2630ffe 100644
|
||||
index d41799d..e08ea0a 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" {
|
||||
@ -59,10 +69,10 @@ index 90b8278d..f2630ffe 100644
|
||||
<I372> = 372; // #define KEY_FAVORITES 364
|
||||
- <I382> = 382; // #define KEY_KEYBOARD 374
|
||||
<I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
<I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 4d774fac..469a7d65 100644
|
||||
index 5ab6feb..72cc45d 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -219,7 +219,6 @@ xkb_symbols "evdev" {
|
||||
@ -71,51 +81,59 @@ index 4d774fac..469a7d65 100644
|
||||
key <I372> { [ XF86Favorites ] };
|
||||
- key <I382> { [ XF86Keyboard ] };
|
||||
key <I569> { [ XF86RotationLockToggle ] };
|
||||
key <I380> { [ XF86FullScreen ] };
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa
|
||||
Author: Andreas Boll <aboll@debian.org>
|
||||
Date: Mon Feb 11 14:55:34 2019 +0100
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites"
|
||||
|
||||
This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
|
||||
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 patch breaks keyboard layouts in XWayland applications when having
|
||||
several keyboard layouts enabled.
|
||||
This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
|
||||
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
This patch breaks keyboard layouts in XWayland applications when having
|
||||
several keyboard layouts enabled.
|
||||
|
||||
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
|
||||
See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
|
||||
|
||||
Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
|
||||
dependency on x11-xkb-utils.
|
||||
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 f2630ffe..51a6e26d 100644
|
||||
index e08ea0a..8ed0fa9 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,8 +284,7 @@ default xkb_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
|
||||
<I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
<I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 469a7d65..ef0635a7 100644
|
||||
index 72cc45d..2a5ab74 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,8 +218,7 @@ xkb_symbols "evdev" {
|
||||
@@ -218,7 +218,6 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I372> { [ XF86Favorites ] };
|
||||
key <I569> { [ XF86RotationLockToggle ] };
|
||||
key <I380> { [ XF86FullScreen ] };
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
From 86c0e56796658a8a3ba1246252e88a997f48a359 Mon Sep 17 00:00:00 2001
|
||||
From 9d3629f7a6edce20990ca75d879097abe62bc8a7 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Fri, 14 Jun 2019 01:00:37 +0100
|
||||
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:
|
||||
@ -10,36 +10,38 @@ Jun 14 00:55:54 NUC xorg-launch[722]: > This warning only show
|
||||
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 | 2 --
|
||||
symbols/inet | 2 --
|
||||
2 files changed, 4 deletions(-)
|
||||
keycodes/evdev | 3 ---
|
||||
symbols/inet | 3 ---
|
||||
2 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index bac7e36..51a6e26 100644
|
||||
index 8ed0fa9..f7d5c7b 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" {
|
||||
@@ -284,9 +284,6 @@ default xkb_keycodes "evdev" {
|
||||
<I254> = 254; // #define KEY_WWAN 246
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
- <I569> = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561
|
||||
- <I380> = 380; // #define KEY_FULL_SCREEN 372
|
||||
-
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
<MDSW> = 203;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 1229617..39cf9dc 100644
|
||||
index 2a5ab74..0fb78cd 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
|
||||
@@ -218,9 +218,6 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I569> { [ XF86RotationLockToggle ] };
|
||||
- key <I380> { [ XF86FullScreen ] };
|
||||
-
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
key <FK15> { [ XF86Launch6 ] };
|
||||
--
|
||||
2.14.1
|
||||
2.7.4
|
||||
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From bb68466121aa7a4fd5e5af0ef781235b8dbc4ce7 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Sun, 16 Feb 2020 09:41:43 +0000
|
||||
Subject: [PATCH] fix python3 support
|
||||
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
|
||||
---
|
||||
rules/compat/map-variants.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
|
||||
index ebbfec9..979ba43 100755
|
||||
--- a/rules/compat/map-variants.py
|
||||
+++ b/rules/compat/map-variants.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python3
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
import argparse
|
||||
import re
|
||||
@@ -12,8 +12,8 @@ class Layout(object):
|
||||
assert variant is None
|
||||
# parse a layout(variant) string
|
||||
match = re.match(r'([^(]+)\(([^)]+)\)', layout)
|
||||
- self.layout = match[1]
|
||||
- self.variant = match[2]
|
||||
+ self.layout = match.groups()[0]
|
||||
+ self.variant = match.groups()[1]
|
||||
|
||||
def __str__(self):
|
||||
if self.variant:
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user