mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
xkeyboard-config: update to xkeyboard-config-2.27
This commit is contained in:
MilhouseVH
parent
b350409a87
commit
8a44aff0ae
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xkeyboard-config"
|
||||
PKG_VERSION="2.26"
|
||||
PKG_SHA256="393718c7460cd06c4e8cb819d943ca54812ea476f32714c4d8975c77031a038e"
|
||||
PKG_VERSION="2.27"
|
||||
PKG_SHA256="690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f"
|
||||
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"
|
||||
@ -32,10 +32,3 @@ pre_configure_target() {
|
||||
--with-xkb-rules-symlink=xorg"
|
||||
fi
|
||||
}
|
||||
|
||||
pre_build_target() {
|
||||
# broken autoreconf
|
||||
( cd ${PKG_BUILD}
|
||||
intltoolize --force
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,85 +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] Fixed broken pt layout
|
||||
|
||||
Backticks broke it, removed
|
||||
---
|
||||
symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
|
||||
1 file changed, 31 insertions(+), 31 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 `<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 `<CAPS>` { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
|
||||
+ 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 <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 ] };
|
||||
};
|
||||
--
|
||||
2.18.1
|
||||
|
||||
|
||||
@ -57,10 +57,10 @@ index 90b8278d..f2630ffe 100644
|
||||
<I255> = 255; // #define KEY_RFKILL 247
|
||||
|
||||
<I372> = 372; // #define KEY_FAVORITES 364
|
||||
- <I374> = 374; // #define KEY_KEYBOARD 366
|
||||
- <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 4d774fac..469a7d65 100644
|
||||
--- a/symbols/inet
|
||||
@ -69,10 +69,10 @@ index 4d774fac..469a7d65 100644
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
key <I372> { [ XF86Favorites ] };
|
||||
- key <I374> { [ XF86Keyboard ] };
|
||||
- key <I382> { [ XF86Keyboard ] };
|
||||
key <I569> { [ XF86RotationLockToggle ] };
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa
|
||||
Author: Andreas Boll <aboll@debian.org>
|
||||
Date: Mon Feb 11 14:55:34 2019 +0100
|
||||
@ -97,25 +97,25 @@ diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index f2630ffe..51a6e26d 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" {
|
||||
@@ -284,8 +284,7 @@ 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
|
||||
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
<MDSW> = 203;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 469a7d65..ef0635a7 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
|
||||
@@ -218,8 +218,7 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I372> { [ XF86Favorites ] };
|
||||
-
|
||||
key <I569> { [ XF86RotationLockToggle ] };
|
||||
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
key <FK15> { [ XF86Launch6 ] };
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From 86c0e56796658a8a3ba1246252e88a997f48a359 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Fri, 14 Jun 2019 01:00:37 +0100
|
||||
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 | 2 --
|
||||
symbols/inet | 2 --
|
||||
2 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/keycodes/evdev b/keycodes/evdev
|
||||
index bac7e36..51a6e26 100644
|
||||
--- a/keycodes/evdev
|
||||
+++ b/keycodes/evdev
|
||||
@@ -284,8 +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
|
||||
-
|
||||
// Fake keycodes for virtual keys
|
||||
<LVL3> = 92;
|
||||
<MDSW> = 203;
|
||||
diff --git a/symbols/inet b/symbols/inet
|
||||
index 1229617..39cf9dc 100644
|
||||
--- a/symbols/inet
|
||||
+++ b/symbols/inet
|
||||
@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
|
||||
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
|
||||
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
|
||||
|
||||
- key <I569> { [ XF86RotationLockToggle ] };
|
||||
-
|
||||
key <FK13> { [ XF86Tools ] };
|
||||
key <FK14> { [ XF86Launch5 ] };
|
||||
key <FK15> { [ XF86Launch6 ] };
|
||||
--
|
||||
2.14.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user