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

xkeyboard-config: updated to 2.26 / added fix for broken pt layout

Browse Source
This commit is contained in:
5schatten 2019-04-03 11:59:02 +02:00
parent 20e2dd9dc1
commit 1b1b509e5e
2 changed files with 109 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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