pool/xkeyboard-config
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
pool:devel
rpm:factory
..
compare: rpm:factory
Branches Tags
rpm:factory
pool:factory
pool:devel

No commits in common. "factory" and "factory" have entirely different histories.
factory ... factory

6 changed files with 5 additions and 132 deletions
Show Stats Expand all files Collapse all files

16
n_fi-kotoistus-metainfo.patch
View File

@ -1,16 +0,0 @@
diff -u -r xkeyboard-config-2.42.orig/rules/base.xml xkeyboard-config-2.42/rules/base.xml
--- xkeyboard-config-2.42.orig/rules/base.xml 2024-10-28 11:16:26.702599000 +0100
+++ xkeyboard-config-2.42/rules/base.xml 2024-10-28 11:36:02.956383000 +0100
@@ -3375,6 +3375,12 @@
<variantList>
<variant>
<configItem>
+ <name>kotoistus</name>
+ <description>Finnish (official)</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>winkeys</name>
<description>Finnish (Windows)</description>
</configItem>

75
python-3.11.patch
View File

@ -1,75 +0,0 @@
diff -u -r -p xkeyboard-config-2.42.orig/meson.build xkeyboard-config-2.42/meson.build
--- xkeyboard-config-2.42.orig/meson.build 2024-12-09 14:33:33.685493000 +0100
+++ xkeyboard-config-2.42/meson.build 2024-12-09 14:35:09.281509000 +0100
@@ -77,7 +77,7 @@ endif
# pytest suite
pymod = import('python')
-python = pymod.find_installation('python3',
+python = pymod.find_installation('python3.11',
modules: ['pytest'],
required: false)
pytest = find_program('pytest-3', 'pytest', required: false)
@@ -86,7 +86,7 @@ if enable_pytest
pytest_args = ['--verbose', '--log-level=DEBUG']
# use pytest xdist if available, it really speeds up the tests cases
optional_python_modules = ['xdist']
- if pymod.find_installation('python3', modules: optional_python_modules, required: false).found()
+ if pymod.find_installation('python3.11', modules: optional_python_modules, required: false).found()
pytest_args += ['-n', 'auto']
endif
diff -u -r -p xkeyboard-config-2.42.orig/rules/compat/map-variants.py xkeyboard-config-2.42/rules/compat/map-variants.py
--- xkeyboard-config-2.42.orig/rules/compat/map-variants.py 2024-12-09 14:33:37.968787000 +0100
+++ xkeyboard-config-2.42/rules/compat/map-variants.py 2024-12-09 14:35:19.598496000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
import argparse
import re
diff -u -r -p xkeyboard-config-2.42.orig/rules/generate-options-symbols.py xkeyboard-config-2.42/rules/generate-options-symbols.py
--- xkeyboard-config-2.42.orig/rules/generate-options-symbols.py 2024-12-09 14:33:38.057788000 +0100
+++ xkeyboard-config-2.42/rules/generate-options-symbols.py 2024-12-09 14:35:24.650708000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
#
# This file is formatted with python black
#
diff -u -r -p xkeyboard-config-2.42.orig/rules/merge.py xkeyboard-config-2.42/rules/merge.py
--- xkeyboard-config-2.42.orig/rules/merge.py 2024-12-09 14:33:38.086824000 +0100
+++ xkeyboard-config-2.42/rules/merge.py 2024-12-09 14:35:28.163506000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
import argparse
import sys
diff -u -r -p xkeyboard-config-2.42.orig/scripts/symbols-tree.py xkeyboard-config-2.42/scripts/symbols-tree.py
--- xkeyboard-config-2.42.orig/scripts/symbols-tree.py 2024-12-09 14:33:38.372760000 +0100
+++ xkeyboard-config-2.42/scripts/symbols-tree.py 2024-12-09 14:35:31.811319000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
#
# Builds a tree view of a symbols file (showing all includes)
#
diff -u -r -p xkeyboard-config-2.42.orig/tests/test_rules_xml.py xkeyboard-config-2.42/tests/test_rules_xml.py
--- xkeyboard-config-2.42.orig/tests/test_rules_xml.py 2024-12-09 14:33:45.854374000 +0100
+++ xkeyboard-config-2.42/tests/test_rules_xml.py 2024-12-09 14:35:35.266642000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
#
# Call with pytest. Requires XKB_CONFIG_ROOT to be set
diff -u -r -p xkeyboard-config-2.42.orig/tests/test_xkb_symbols.py xkeyboard-config-2.42/tests/test_xkb_symbols.py
--- xkeyboard-config-2.42.orig/tests/test_xkb_symbols.py 2024-12-09 14:33:45.884365000 +0100
+++ xkeyboard-config-2.42/tests/test_xkb_symbols.py 2024-12-09 14:35:39.039457000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.11
#
# Call with pytest. Requires XKB_CONFIG_ROOT to be set

BIN
xkeyboard-config-2.42.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
xkeyboard-config-2.44.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54d2c33eeebb031d48fa590c543e54c9bcbd0f00386ebc6489b2f47a0da4342a
size 906060

27
xkeyboard-config.changes
View File

@ -1,30 +1,3 @@
-------------------------------------------------------------------
Fri Feb 14 22:02:11 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 2.44 (boo#1237205)
* Fixes and updates to multiple layouts, making them match
current and updated specificatiopns
* Changes to multiple layouts that change behavior
* Add Diktor layout ru(diktor), and RuIntl layouts set
ru(ruintl_ru), ru(ruintl_en).
* Expanded options for caps locking behavior for multiple
layouts
* Add <I570> keycode (KEY_REFRESH_RATE_TOGGLE)
-------------------------------------------------------------------
Mon Dec 9 13:39:32 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- python-3.11.patch/buildrequire python311-base
* fixes build on Leap 15.6 and sle15-sp7
-------------------------------------------------------------------
Mon Oct 28 10:38:05 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- n_fi-kotoistus-metainfo.patch
* add meta information for default variant of "fi" keyboard layout
"kotoistus" needed for GNOME or other users of xkeyboard meta XML
files (boo#1227420)
-------------------------------------------------------------------
Sat Jun 8 22:11:04 UTC 2024 - Dirk Müller <dmueller@suse.com>

13
xkeyboard-config.spec
View File

@ -17,7 +17,7 @@
Name: xkeyboard-config
Version: 2.44
Version: 2.42
Release: 0
Summary: The X Keyboard Extension
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
@ -26,19 +26,11 @@ URL: https://www.freedesktop.org/Software/XKeyboardConfig
Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
Patch109: n_disable-2xalt_2xctrl-toggle.diff
Patch110: n_fi-kotoistus-metainfo.patch
%if 0%{?suse_version} < 1550
Patch0: python-3.11.patch
%endif
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: meson
BuildRequires: pkgconfig
%if 0%{?suse_version} < 1550
BuildRequires: python311-base
%else
BuildRequires: python3-base
%endif
BuildRequires: xsltproc
BuildRequires: perl(XML::Parser)
BuildRequires: pkgconfig(xorg-macros) >= 1.12
@ -79,7 +71,7 @@ rm -rf %{_localstatedir}/lib/xkb/compiled/server*.xkm
%files
%license COPYING
%doc AUTHORS docs/HOWTO.* docs/README.*
%doc AUTHORS README docs/HOWTO.* docs/README.*
%dir %{_localstatedir}/lib/xkb
%dir %{_localstatedir}/lib/xkb/compiled
%dir %{_datadir}/X11
@ -88,6 +80,5 @@ rm -rf %{_localstatedir}/lib/xkb/compiled/server*.xkm
%{_mandir}/man7/*
%files lang -f %{name}.lang
%license COPYING
%changelog