package/x11r7/xkeyboard-config: bump version to 2.30
Removed patch which was committed upstream, updated project URL, reformatted hashes. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
e16785dc7c
commit
d63e242677
|
@ -1,37 +0,0 @@
|
|||
From c847c834cce190c5c835a454bfe548195da9fa53 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
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/c847c834cce190c5c835a454bfe548195da9fa53]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@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:
|
||||
--
|
||||
2.24.1
|
||||
|
|
@ -7,4 +7,4 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG
|
|||
help
|
||||
keyboard configuration database for X
|
||||
|
||||
http://xlibs.freedesktop.org/xkbdesc
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# Locally computed
|
||||
sha256 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802 xkeyboard-config-2.29.tar.bz2
|
||||
sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING
|
||||
sha256 095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4 xkeyboard-config-2.30.tar.bz2
|
||||
sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
XKEYBOARD_CONFIG_VERSION = 2.29
|
||||
XKEYBOARD_CONFIG_VERSION = 2.30
|
||||
XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
|
||||
XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config
|
||||
XKEYBOARD_CONFIG_LICENSE = MIT
|
||||
|
|
Loading…
Reference in a new issue