jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3398 from 5schatten/xkeyboard-config

Browse Source 
xkeyboard-config: updated to 2.26
This commit is contained in:
CvH 2019-04-14 14:18:53 +02:00 committed by GitHub
commit 72fc281c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 230 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/x11/data/xkeyboard-config/package.mk
View File

@ -1,37 +1,41 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="xkeyboard-config"
PKG_VERSION="2.23.1"
PKG_SHA256="2a4bbc05fea22151b7a7c8ac2655d549aa9b0486bedc7f5a68c72716343b02f3"
PKG_LICENSE="OSS"
PKG_VERSION="2.26"
PKG_SHA256="393718c7460cd06c4e8cb819d943ca54812ea476f32714c4d8975c77031a038e"
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"
PKG_DEPENDS_TARGET="toolchain util-macros"
PKG_LONGDESC="X keyboard extension data files."
PKG_TOOLCHAIN="autotools"
if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="toolchain util-macros xkbcomp"
DISPLAYSERVER_XKEYBOARD="XKBCOMP=/usr/bin/xkbcomp \
--with-xkb-base=$XORG_PATH_XKB \
--with-xkb-rules-symlink=xorg"
configure_package() {
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" xkbcomp"
fi
}
else
PKG_DEPENDS_TARGET="toolchain util-macros"
DISPLAYSERVER_XKEYBOARD=""
fi
pre_configure_target() {
PKG_CONFIGURE_OPTS_TARGET="--without-xsltproc \
--enable-compat-rules \
--disable-runtime-deps \
--enable-nls \
--disable-rpath \
--with-gnu-ld"
PKG_CONFIGURE_OPTS_TARGET="--without-xsltproc \
--enable-compat-rules \
--disable-runtime-deps \
--enable-nls \
--disable-rpath \
--with-gnu-ld \
$DISPLAYSERVER_XKEYBOARD"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" XKBCOMP=/usr/bin/xkbcomp \
--with-xkb-base=${XORG_PATH_XKB} \
--with-xkb-rules-symlink=xorg"
fi
}
pre_build_target() {
# broken autoreconf
( cd $PKG_BUILD
( cd ${PKG_BUILD}
intltoolize --force
)
}

85
packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch Normal file
View File

@ -0,0 +1,85 @@
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

121
packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch Normal file
View File

@ -0,0 +1,121 @@
commit a77adbe8d56dcaf4a138aa4026134e2869aa61cb
Author: Andreas Boll <aboll@debian.org>
Date: Mon Feb 11 14:00:49 2019 +0100
Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to XF86MonBrightnessCycle"
This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458.
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
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
diff --git a/symbols/inet b/symbols/inet
index 8e65c5e5..4d774fac 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -212,7 +212,7 @@ xkb_symbols "evdev" {
key <I246> { [ XF86WLAN ] };
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
- key <I251> { [ XF86MonBrightnessCycle ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
+// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
// 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
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.
diff --git a/keycodes/evdev b/keycodes/evdev
index 90b8278d..f2630ffe 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" {
<I255> = 255; // #define KEY_RFKILL 247
<I372> = 372; // #define KEY_FAVORITES 364
- <I374> = 374; // #define KEY_KEYBOARD 366
// Fake keycodes for virtual keys
<LVL3> = 92;
diff --git a/symbols/inet b/symbols/inet
index 4d774fac..469a7d65 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -219,7 +219,6 @@ xkb_symbols "evdev" {
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
key <I372> { [ XF86Favorites ] };
- key <I374> { [ XF86Keyboard ] };
key <FK13> { [ XF86Tools ] };
key <FK14> { [ XF86Launch5 ] };
commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa
Author: Andreas Boll <aboll@debian.org>
Date: Mon Feb 11 14:55:34 2019 +0100
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.
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" {
<I254> = 254; // #define KEY_WWAN 246
<I255> = 255; // #define KEY_RFKILL 247
- <I372> = 372; // #define KEY_FAVORITES 364
-
// 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" {
key <I254> { [ XF86WWAN ] }; // KEY_WWAN
key <I255> { [ XF86RFKill ] }; // KEY_RFKILL
- key <I372> { [ XF86Favorites ] };
-
key <FK13> { [ XF86Tools ] };
key <FK14> { [ XF86Launch5 ] };
key <FK15> { [ XF86Launch6 ] };