diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-06-08 09:46:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-08 21:42:24 +0100 |
commit | b14fbbf69c4d8a81b470612058e9559c76d97cca (patch) | |
tree | 9b1aa84337e1a1f851295e3c1d6f4a4daa441474 /meta/recipes-graphics/xorg-lib | |
parent | 3922eaf495f29be29cf685556935deb9649bae24 (diff) | |
download | openembedded-core-contrib-b14fbbf69c4d8a81b470612058e9559c76d97cca.tar.gz |
xkeyboard-config: upgrade 2.29 -> 2.30
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch | 34 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb (renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb) | 7 |
2 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch deleted file mode 100644 index f723f70332..0000000000 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 168ac446cdd9a1b59d6b708360a9556515ba56b9 Mon Sep 17 00:00:00 2001 -From: MilhouseVH <milhouseVH.github@nmacleod.com> -Date: Sun, 16 Feb 2020 09:41:43 +0000 -Subject: [PATCH] fix python3 support - -https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - 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: diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb index 598b584787..a4d67cd2ce 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb @@ -12,11 +12,8 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \ - file://0001-fix-python3-support.patch \ - " -SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" -SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" |