xkeyboard-config: update to xkeyboard-config-2.27

CoreELEC · Jun 15, 2019 · 8a44aff · 8a44aff
1 parent b350409
commit 8a44aff
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 104 deletions.
diff --git 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
diff --git a/...onfig/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch b/...onfig/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch
@@ -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       ]       };
diff --git a/...es/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch b/...es/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 <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
+