From 4351cf377e367faa07de388b5fbfb4923ade83a6 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Tue, 19 Oct 2021 18:29:15 +0200 Subject: [PATCH] xkeyboard-config: updated to 2.34 - dropped patches fixed by xkbcomp pkg bump --- packages/x11/data/xkeyboard-config/package.mk | 4 +- ...its-depending-on-unreleased-packages.patch | 105 ------------------ ...config-0003-drop-unsupported-keycode.patch | 51 --------- 3 files changed, 2 insertions(+), 158 deletions(-) delete mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch delete mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 7abe99ae4f..46752d53f1 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.31" -PKG_SHA256="da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3" +PKG_VERSION="2.34" +PKG_SHA256="b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce" 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" 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 deleted file mode 100644 index 03c61059ac..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 5bb6d783f40d8aa61da2095c08a6933bb1ee7bf3 Mon Sep 17 00:00:00 2001 -From: Andreas Boll -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" { - = 255; // #define KEY_RFKILL 247 - - = 372; // #define KEY_FAVORITES 364 - = 380; // #define KEY_FULL_SCREEN 372 -- = 382; // #define KEY_KEYBOARD 374 - = 442; // #define KEY_DOLLAR 434 - = 443; // #define KEY_EURO 435 - = 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 { [ XF86RFKill ] }; // KEY_RFKILL - - key { [ XF86Favorites ] }; - key { [ XF86FullScreen ] }; -- key { [ XF86Keyboard ] }; - key { [ dollar ] }; - key { [ EuroSign ] }; - key { [ XF86RotationLockToggle ] }; - --- -2.7.4 - - -From 9415d810808061cbb38832c4abf636606f3ed2ad Mon Sep 17 00:00:00 2001 -From: Andreas Boll -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" { - = 254; // #define KEY_WWAN 246 - = 255; // #define KEY_RFKILL 247 - -- = 372; // #define KEY_FAVORITES 364 - = 380; // #define KEY_FULL_SCREEN 372 - = 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 { [ XF86WWAN ] }; // KEY_WWAN - key { [ XF86RFKill ] }; // KEY_RFKILL - -- key { [ XF86Favorites ] }; - key { [ XF86FullScreen ] }; - key { [ dollar ] }; - --- -2.7.4 - 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 deleted file mode 100644 index 2d0ca80754..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9d3629f7a6edce20990ca75d879097abe62bc8a7 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -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: -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 | 3 --- - symbols/inet | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/keycodes/evdev b/keycodes/evdev -index 8ed0fa9..f7d5c7b 100644 ---- a/keycodes/evdev -+++ b/keycodes/evdev -@@ -284,11 +284,8 @@ default xkb_keycodes "evdev" { - = 254; // #define KEY_WWAN 246 - = 255; // #define KEY_RFKILL 247 - -- = 380; // #define KEY_FULL_SCREEN 372 - = 442; // #define KEY_DOLLAR 434 - = 443; // #define KEY_EURO 435 -- = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 -- - // Fake keycodes for virtual keys - = 92; - = 203; -diff --git a/symbols/inet b/symbols/inet -index 2a5ab74..0fb78cd 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -218,11 +218,8 @@ xkb_symbols "evdev" { - key { [ XF86WWAN ] }; // KEY_WWAN - key { [ XF86RFKill ] }; // KEY_RFKILL - -- key { [ XF86FullScreen ] }; - key { [ dollar ] }; - key { [ EuroSign ] }; -- key { [ XF86RotationLockToggle ] }; -- - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; - key { [ XF86Launch6 ] }; --- -2.7.4 -