diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 92ebd3dce13..da05e2ffb96 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -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 - ) -} diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch deleted file mode 100644 index 19c1d0603df..00000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch +++ /dev/null @@ -1,85 +0,0 @@ -From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001 -From: Sergey Udaltsov -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 `` { [ q, Q, at, Greek_OMEGA ] }; -- key `` { [ w, W, lstroke, Lstroke ] }; -- key `` { [ f, F, dstroke, ordfeminine ] }; -- key `` { [ p, P, thorn, THORN ] }; -- key `` { [ g, G, eng, ENG ] }; -- key `` { [ j, J, dead_hook, dead_horn ] }; -- key `` { [ l, L, lstroke, Lstroke ] }; -- key `` { [ u, U, downarrow, uparrow ] }; -- key `` { [ y, Y, leftarrow, yen ] }; -- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -- -- key `` { [ a, A, ae, AE ] }; -- key `` { [ r, R, paragraph, registered ] }; -- key `` { [ s, S, ssharp, section ] }; -- key `` { [ t, T, tslash, Tslash ] }; -- key `` { [ d, D, eth, ETH ] }; -- key `` { [ h, H, hstroke, Hstroke ] }; -- key `` { [ n, N, n, N ] }; -- key `` { [ e, E, EuroSign, cent ] }; -- key `` { [ i, I, rightarrow, idotless ] }; -- key `` { [ o, O, oslash, Ooblique ] }; -- -- key `` { [ z, Z, guillemotleft, less ] }; -- key `` { [ x, X, guillemotright, greater ] }; -- key `` { [ c, C, cent, copyright ] }; -- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -- key `` { [ k, K, kra, ampersand ] }; -- key `` { [ m, M, mu, masculine ] }; -- -- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -+ key { [ q, Q, at, Greek_OMEGA ] }; -+ key { [ w, W, lstroke, Lstroke ] }; -+ key { [ f, F, dstroke, ordfeminine ] }; -+ key { [ p, P, thorn, THORN ] }; -+ key { [ g, G, eng, ENG ] }; -+ key { [ j, J, dead_hook, dead_horn ] }; -+ key { [ l, L, lstroke, Lstroke ] }; -+ key { [ u, U, downarrow, uparrow ] }; -+ key { [ y, Y, leftarrow, yen ] }; -+ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -+ -+ key { [ a, A, ae, AE ] }; -+ key { [ r, R, paragraph, registered ] }; -+ key { [ s, S, ssharp, section ] }; -+ key { [ t, T, tslash, Tslash ] }; -+ key { [ d, D, eth, ETH ] }; -+ key { [ h, H, hstroke, Hstroke ] }; -+ key { [ n, N, n, N ] }; -+ key { [ e, E, EuroSign, cent ] }; -+ key { [ i, I, rightarrow, idotless ] }; -+ key { [ o, O, oslash, Ooblique ] }; -+ -+ key { [ z, Z, guillemotleft, less ] }; -+ key { [ x, X, guillemotright, greater ] }; -+ key { [ c, C, cent, copyright ] }; -+ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -+ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -+ key { [ k, K, kra, ampersand ] }; -+ key { [ m, M, mu, masculine ] }; -+ -+ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - }; --- -2.18.1 - - diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch index 72add379855..7cbb8fc69c9 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch @@ -57,10 +57,10 @@ index 90b8278d..f2630ffe 100644 = 255; // #define KEY_RFKILL 247 = 372; // #define KEY_FAVORITES 364 -- = 374; // #define KEY_KEYBOARD 366 +- = 382; // #define KEY_KEYBOARD 374 + = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 // Fake keycodes for virtual keys - = 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 { [ XF86RFKill ] }; // KEY_RFKILL key { [ XF86Favorites ] }; -- key { [ XF86Keyboard ] }; +- key { [ XF86Keyboard ] }; + key { [ XF86RotationLockToggle ] }; key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa Author: Andreas Boll 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" { = 254; // #define KEY_WWAN 246 = 255; // #define KEY_RFKILL 247 - = 372; // #define KEY_FAVORITES 364 -- + = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 + // Fake keycodes for virtual keys = 92; - = 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 { [ XF86WWAN ] }; // KEY_WWAN key { [ XF86RFKill ] }; // KEY_RFKILL - key { [ XF86Favorites ] }; -- + key { [ XF86RotationLockToggle ] }; + key { [ XF86Tools ] }; key { [ XF86Launch5 ] }; - key { [ XF86Launch6 ] }; diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch new file mode 100644 index 00000000000..3815c0bf788 --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch @@ -0,0 +1,45 @@ +From 86c0e56796658a8a3ba1246252e88a997f48a359 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +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 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" { + = 254; // #define KEY_WWAN 246 + = 255; // #define KEY_RFKILL 247 + +- = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 +- + // Fake keycodes for virtual keys + = 92; + = 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 { [ XF86WWAN ] }; // KEY_WWAN + key { [ XF86RFKill ] }; // KEY_RFKILL + +- key { [ XF86RotationLockToggle ] }; +- + key { [ XF86Tools ] }; + key { [ XF86Launch5 ] }; + key { [ XF86Launch6 ] }; +-- +2.14.1 +