commit 39fa69337eee0037e2f0f938f48169aa0f560e0b
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 6 18:54:31 2024 +0200
- updated to 2.43
xkeyboard-config-py310.patch | 12 ------------
xkeyboard-config.spec | 12 +++++-------
2 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index f2348c5..6800e2c 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,21 +1,20 @@
-# TODO: drop py310 patch and BR python>=3.11 when available in PLD (instead of
separate StrEnum package)
+# TODO: 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.42
+Version: 2.43
Release: 1
License: MIT
Group: X11/Development/Libraries
Source0:
https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.xz
-# Source0-md5: 2d3b7e43e597f4c607ad6261e2b3d77f
-Patch0: %{name}-py310.patch
+# Source0-md5: 2f6226ecd797f7afc5a2e83726383cf1
URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig
BuildRequires: gettext-tools >= 0.19.8
BuildRequires: libxslt-progs
-BuildRequires: meson >= 0.54.0
+BuildRequires: meson >= 0.56.0
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
-BuildRequires: python3 >= 1:3.7
+BuildRequires: python3 >= 1:3.9
BuildRequires: python3-StrEnum
BuildRequires: rpmbuild(macros) >= 1.446
BuildRequires: tar >= 1:1.22
@@ -47,7 +46,6 @@ 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
deleted file mode 100644
index 903034b..0000000
--- a/xkeyboard-config-py310.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/39fa69337eee0037e2f0f938f48169aa0f560e0b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
