summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-03 18:25:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-05 13:19:54 +0100
commit08b9f9fe50f1b8271a623a15bf14283e66354263 (patch)
tree97dcdd858ab5ba199f33d56d56a56581c65e89b6 /meta/recipes-graphics/xorg-lib
parent576da5a88e9e1c5d13e8f627fa24b7d373827f3e (diff)
downloadpoky-08b9f9fe50f1b8271a623a15bf14283e66354263.tar.gz
xkeyboard-config: update to 2.29
(From OE-Core rev: 430fccaf952e4e327d8f8898e83a1db3019ffd47) 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.patch34
-rw-r--r--meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb (renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb)8
2 files changed, 39 insertions, 3 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
new file mode 100644
index 0000000000..f723f70332
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch
@@ -0,0 +1,34 @@
1From 168ac446cdd9a1b59d6b708360a9556515ba56b9 Mon Sep 17 00:00:00 2001
2From: MilhouseVH <milhouseVH.github@nmacleod.com>
3Date: Sun, 16 Feb 2020 09:41:43 +0000
4Subject: [PATCH] fix python3 support
5
6https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
7
8Upstream-Status: Backport
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 rules/compat/map-variants.py | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
15index ebbfec9..979ba43 100755
16--- a/rules/compat/map-variants.py
17+++ b/rules/compat/map-variants.py
18@@ -1,4 +1,4 @@
19-#!/usr/bin/python3
20+#!/usr/bin/env python3
21
22 import argparse
23 import re
24@@ -12,8 +12,8 @@ class Layout(object):
25 assert variant is None
26 # parse a layout(variant) string
27 match = re.match(r'([^(]+)\(([^)]+)\)', layout)
28- self.layout = match[1]
29- self.variant = match[2]
30+ self.layout = match.groups()[0]
31+ self.variant = match.groups()[1]
32
33 def __str__(self):
34 if self.variant:
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb
index 7a3d694bd6..598b584787 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb
@@ -12,9 +12,11 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
12LICENSE = "MIT & MIT-style" 12LICENSE = "MIT & MIT-style"
13LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" 13LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
14 14
15SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" 15SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \
16SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" 16 file://0001-fix-python3-support.patch \
17SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" 17 "
18SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d"
19SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802"
18 20
19SECTION = "x11/libs" 21SECTION = "x11/libs"
20DEPENDS = "util-macros libxslt-native" 22DEPENDS = "util-macros libxslt-native"