[packages/xkeyboard-config] - updated to 2.42; patched to allow python 3.7..3.10

qboosh qboosh at pld-linux.org
Sat Jun 8 16:08:17 CEST 2024


commit dfe92a5f4bb751e08e40bd99155f2119f4b86f13
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 8 15:29:57 2024 +0200

    - updated to 2.42; patched to allow python 3.7..3.10

 xkeyboard-config-py310.patch | 12 ++++++++++++
 xkeyboard-config.spec        | 10 +++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 7e8950c..f2348c5 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,19 +1,22 @@
+# TODO: drop py310 patch and BR python>=3.11 when available in PLD (instead of separate StrEnum package)
 Summary:	X Keyboard Configuration Database
 Summary(pl.UTF-8):	Baza danych konfiguracji klawiatury pod X
 Name:		xkeyboard-config
-Version:	2.41
+Version:	2.42
 Release:	1
 License:	MIT
 Group:		X11/Development/Libraries
 Source0:	https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.xz
-# Source0-md5:	2f0b843b5283b82cae0402cbc4f374b4
+# Source0-md5:	2d3b7e43e597f4c607ad6261e2b3d77f
+Patch0:		%{name}-py310.patch
 URL:		https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	libxslt-progs
 BuildRequires:	meson >= 0.54.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	python3 >= 1:3.0
+BuildRequires:	python3 >= 1:3.7
+BuildRequires:	python3-StrEnum
 BuildRequires:	rpmbuild(macros) >= 1.446
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-util-util-macros >= 1.12
@@ -44,6 +47,7 @@ systemów opartych na XKB.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build
diff --git a/xkeyboard-config-py310.patch b/xkeyboard-config-py310.patch
new file mode 100644
index 0000000..903034b
--- /dev/null
+++ b/xkeyboard-config-py310.patch
@@ -0,0 +1,12 @@
+--- xkeyboard-config-2.42/rules/generate-options-symbols.py.orig	2024-06-07 20:37:21.000000000 +0200
++++ xkeyboard-config-2.42/rules/generate-options-symbols.py	2024-06-08 09:01:04.768285629 +0200
+@@ -7,7 +7,8 @@
+ 
+ from __future__ import annotations
+ import argparse
+-from enum import StrEnum, unique
++from enum import unique
++from strenum import StrEnum
+ import sys
+ import xml.etree.ElementTree as ET
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xkeyboard-config.git/commitdiff/dfe92a5f4bb751e08e40bd99155f2119f4b86f13



More information about the pld-cvs-commit mailing list