package/x11r7/xkeyboard-config: needs host-python3
PATCH 1/1 package/x11r7/xkeyboard-config: needs host-python3
host-python3 is needed to run map-variants.py since version 2.29 and
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/57c745a9a373b4c9d272d00ff4f16dbcc6d3c48b
Fixes:
- http://autobuild.buildroot.org/results/7c3cdecc2feed62d7e0bad0e790a8bacaaa34cb7
--- .../0001-fix-python3-support.patch | 37 +++++++++++++++++++ .../xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/x11r7/xkeyboard-config/0001-fix-python3-support.patch
package/x11r7/xkeyboard-config/0001-fix-python3-support.patch new file +37 -0
@@ -0,0 +1,37 @@ +From c847c834cce190c5c835a454bfe548195da9fa53 Mon Sep 17 00:00:00 2001 +From: MilhouseVH <[email protected]> +Date: Sun, 16 Feb 2020 09:41:43 +0000 +Subject: [PATCH] fix python3 support + +https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 +[Retrieved from: +https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/c847c834cce190c5c835a454bfe548195da9fa53] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + rules/compat/map-variants.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py +index ebbfec9..979ba43 100755 +--- a/rules/compat/map-variants.py ++++ b/rules/compat/map-variants.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + + import argparse + import re +@@ -12,8 +12,8 @@ class Layout(object): + assert variant is None + # parse a layout(variant) string + match = re.match(r'([^(]+)\(([^)]+)\)', layout) +- self.layout = match[1] +- self.variant = match[2] ++ self.layout = match.groups()[0] ++ self.variant = match.groups()[1] + + def __str__(self): + if self.variant: +-- +2.24.1 +
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1 -1
@@ -14,6 +14,6 @@ XKEYBOARD_CONFIG_LICENSE_FILES = COPYING XKEYBOARD_CONFIG_INSTALL_STAGING = YES XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps -XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-xapp_xkbcomp +XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-python3 host-xapp_xkbcomp $(eval $(autotools-package))
Signature · 1 line
2.25.1
PATCH 1/1 package/x11r7/xkeyboard-config: needs host-python3
Fabrice, All,
On 2020-03-21 10:55 +0100, Fabrice Fontaine spake thusly:
Quoted 7 lines
host-python3 is needed to run
map-variants.pysince version 2.29 and
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/57c745a9a373b4c9d272d00ff4f16dbcc6d3c48bFixes:
- http://autobuild.buildroot.org/results/7c3cdecc2feed62d7e0bad0e790a8bacaaa34cb7Signed-off-by Fabrice Fontaine <[email protected]>
[--SNIP--]
package/x11r7/xkeyboard-config/xkeyboard-config.mk XKEYBOARD_CONFIG_LICENSE_FILES = COPYING · line 17
Quoted 10 lines
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1
-1@@ -14,6 +14,6 @@ XKEYBOARD_CONFIG_LICENSE_FILES = COPYING XKEYBOARD_CONFIG_INSTALL_STAGING = YES XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps -XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-xapp_xkbcomp +XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-python3 host-xapp_xkbcomp
In fact, we don't really need *our* host-python3. The system provided one should suffice, so I've switched to using $(BR2_PYTHON3_HOST_DEPENDENCY) instead, and applied to master. Thanks.
Regards,
Yann E. MORIN.
Quoted 8 lines
package/x11r7/xkeyboard-config/xkeyboard-config.mk +0
-0$(eval $(autotools-package))Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'