mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 06:06:43 +00:00
Merge pull request #3557 from MilhouseVH/le10_packages3
packages: more bumps (only a few)
This commit is contained in:
commit
34c842734b
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mariadb-connector-c"
|
||||
PKG_VERSION="3.1.0"
|
||||
PKG_SHA256="feb82b124fd492264a07ca9618bf68d65487ec4a39c8375015f6b0f58c0ab17c"
|
||||
PKG_VERSION="3.1.1"
|
||||
PKG_SHA256="63a0ecfa3c87ba0361aef3b2c849abe280f7371030e84f41ce0dc4466db85637"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="https://mariadb.org/"
|
||||
PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz"
|
||||
|
@ -1,12 +1,13 @@
|
||||
# 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="nss-mdns"
|
||||
PKG_VERSION="47edc38"
|
||||
PKG_SHA256="f02e8baeceea30e82a2ecdaa8cafdbcabfdaa33a766f6942e7dc8aa81948f7b6"
|
||||
PKG_VERSION="0.14.1"
|
||||
PKG_SHA256="4fe54bffd20e410fc41382dc6c4708cdfa3a65f50c3753f262dc4c78fd864a6e"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/lathiat/nss-mdns"
|
||||
PKG_URL="https://github.com/lathiat/nss-mdns/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_URL="https://github.com/lathiat/nss-mdns/archive/v$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain avahi"
|
||||
PKG_LONGDESC="A plugin for nss to allow name resolution via Multicast DNS."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
@ -1,70 +0,0 @@
|
||||
From 29fdeb2387e3a9cd49d5b1aa09ca23cdea60b91a Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Tue, 15 Aug 2017 09:45:29 +0100
|
||||
Subject: [PATCH] src/nss.c: fix out-of-bounds memset()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
out-of-bounds access happens at memset() call site:
|
||||
|
||||
@@ -272,9 +272,9 @@ enum nss_status _nss_mdns_gethostbyname4_r(
|
||||
// Copy address
|
||||
memcpy(&(tuple->addr), &(u.data.result[i].address), address_length);
|
||||
if(address_length < sizeof(ipv6_address_t)) {
|
||||
memset((&(tuple->addr) + address_length - sizeof(ipv6_address_t)), 0,
|
||||
(sizeof(ipv6_address_t) - address_length)
|
||||
);
|
||||
}
|
||||
|
||||
The problem here is in 'addr' type:
|
||||
struct gaih_addrtuple {
|
||||
...
|
||||
uint32_t addr[4];
|
||||
...
|
||||
};
|
||||
|
||||
It means pointer addressing is not byte-based as offsets imply and memset()
|
||||
wipes 12 bytes in hearby memory (of stack in glibc case).
|
||||
|
||||
valgrind detects the overflow as:
|
||||
|
||||
==12732== Invalid write of size 1
|
||||
==12732== at 0x4C11A29: memset (vg_replace_strmem.c:1239)
|
||||
==12732== by 0x57FA348: _nss_mdns_minimal_gethostbyname4_r (nss.c:292)
|
||||
==12732== by 0x4F016D8: gaih_inet.constprop.7 (getaddrinfo.c:806)
|
||||
==12732== by 0x4F02673: getaddrinfo (getaddrinfo.c:2317)
|
||||
==12732== by 0x4800B3B: main (a.c:34)
|
||||
|
||||
The effect is SIGSEGV-ing getaddrinfo() call on systems with
|
||||
the following nsswitch.conf:
|
||||
|
||||
hosts: files mdns_minimal [NOTFOUND=return] dns
|
||||
|
||||
The fix is to simplify memset()/memcpy() sequence.
|
||||
|
||||
Reported-by: Michał Górny
|
||||
Bug: https://bugs.gentoo.org/627770
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
---
|
||||
src/nss.c | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/nss.c b/src/nss.c
|
||||
index ebb887c..1f50bad 100644
|
||||
--- a/src/nss.c
|
||||
+++ b/src/nss.c
|
||||
@@ -271,12 +271,8 @@ enum nss_status _nss_mdns_gethostbyname4_r(
|
||||
tuple->family = u.data.result[i].af;
|
||||
|
||||
// Copy address
|
||||
+ memset(&(tuple->addr), 0, sizeof(ipv6_address_t));
|
||||
memcpy(&(tuple->addr), &(u.data.result[i].address), address_length);
|
||||
- if(address_length < sizeof(ipv6_address_t)) {
|
||||
- memset((&(tuple->addr) + address_length - sizeof(ipv6_address_t)), 0,
|
||||
- (sizeof(ipv6_address_t) - address_length)
|
||||
- );
|
||||
- }
|
||||
|
||||
// Assign interface scope id
|
||||
tuple->scopeid = u.data.result[i].scopeid;
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="Mako"
|
||||
PKG_VERSION="1.0.10"
|
||||
PKG_SHA256="7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965"
|
||||
PKG_VERSION="1.0.12"
|
||||
PKG_SHA256="0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://pypi.org/project/Mako"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pycryptodome"
|
||||
PKG_VERSION="3.8.1"
|
||||
PKG_SHA256="68ad0ce4a374577a26bb7f458575abe3c2a342818b5280de6e5738870b7761b3"
|
||||
PKG_VERSION="3.8.2"
|
||||
PKG_SHA256="5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://pypi.org/project/pycryptodome"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
|
@ -1,12 +1,13 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="nss"
|
||||
PKG_VERSION="3.37.1"
|
||||
PKG_SHA256="5ac4a388b06b2785fb7f4f0ae3c909d8cbb2ab370147ff61fe2517cc5bf3c685"
|
||||
PKG_VERSION="3.44"
|
||||
PKG_SHA256="298d86e18e96660d3c98476274b5857b48c135d809a10d6528d8661bdf834a49"
|
||||
PKG_LICENSE="Mozilla Public License"
|
||||
PKG_SITE="http://ftp.mozilla.org/"
|
||||
PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_1_RTM/src/nss-3.37.1-with-nspr-4.19.tar.gz"
|
||||
PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_44_RTM/src/nss-3.44-with-nspr-4.21.tar.gz"
|
||||
PKG_DEPENDS_HOST="nspr:host zlib:host"
|
||||
PKG_DEPENDS_TARGET="toolchain nss:host nspr zlib sqlite"
|
||||
PKG_LONGDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications"
|
||||
|
@ -1,20 +1,15 @@
|
||||
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
|
||||
index e6a94d35c..0c714c85c 100644
|
||||
index bff11c7..0c714c8 100644
|
||||
--- a/nss/lib/freebl/Makefile
|
||||
+++ b/nss/lib/freebl/Makefile
|
||||
@@ -535,12 +535,14 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
|
||||
# All intel architectures get the 64 bit version
|
||||
# With custom uint128 if necessary (faster than generic 32 bit version).
|
||||
ECL_SRCS += curve25519_64.c
|
||||
- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
|
||||
+ VERIFIED_SRCS += Hacl_Curve25519.c
|
||||
else
|
||||
# All non intel architectures get the generic 32 bit implementation (slow!)
|
||||
@@ -541,9 +541,7 @@ else
|
||||
ECL_SRCS += curve25519_32.c
|
||||
endif
|
||||
|
||||
|
||||
-ifndef HAVE_INT128_SUPPORT
|
||||
- VERIFIED_SRCS += FStar.c
|
||||
-endif
|
||||
+VERIFIED_SRCS += FStar.c
|
||||
+
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="e2fsprogs"
|
||||
PKG_VERSION="1.45.1"
|
||||
PKG_SHA256="24acedbe376a9c1b5c0a0b15c9fb84b3bef4943d669caf40b2e3e41e86d95548"
|
||||
PKG_VERSION="1.45.2"
|
||||
PKG_SHA256="4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://e2fsprogs.sourceforge.net/"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libevdev"
|
||||
PKG_VERSION="1.6.0"
|
||||
PKG_SHA256="f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814"
|
||||
PKG_VERSION="1.7.0"
|
||||
PKG_SHA256="11dbe1f2b1d03a51f3e9a196757a75c3a999042ce34cf1fdc00a2363e5a2e369"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/"
|
||||
PKG_URL="http://www.freedesktop.org/software/libevdev/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
@ -3,12 +3,13 @@
|
||||
|
||||
PKG_NAME="procps-ng"
|
||||
PKG_VERSION="3.3.15"
|
||||
PKG_SHA256="10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465"
|
||||
PKG_SHA256="191391fde24a1d3b9b0030d26f8dfdcbf641d36297aab7ecf2f941c5ca927e21"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://gitlab.com/procps-ng/procps"
|
||||
PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain ncurses"
|
||||
PKG_LONGDESC="Command line and full screen utilities for browsing procfs."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="+pic"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libmicrohttpd"
|
||||
PKG_VERSION="0.9.63"
|
||||
PKG_SHA256="37c36f1be177f0e37ef181a645cd3baac1000bd322a01c2eff70f3cc8c91749c"
|
||||
PKG_VERSION="0.9.64"
|
||||
PKG_SHA256="e792d8ed5990823a0baadea0adf94365999e702f6f1314ef9c555018dafc350e"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="http://www.gnu.org/software/libmicrohttpd/"
|
||||
PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="nghttp2"
|
||||
PKG_VERSION="1.38.0"
|
||||
PKG_SHA256="ef75c761858241c6b4372fa6397aa0481a984b84b7b07c4ec7dc2d7b9eee87f8"
|
||||
PKG_VERSION="1.39.1"
|
||||
PKG_SHA256="679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/nghttp2.html"
|
||||
PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VERSION/nghttp2-$PKG_VERSION.tar.xz"
|
||||
|
@ -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
|
||||
)
|
||||
}
|
||||
|
@ -1,85 +0,0 @@
|
||||
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
|
||||
|
||||
|
@ -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 ] };
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user