Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xkeyboard-config for
openSUSE:Factory checked in at 2024-12-10 23:43:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old)
and /work/SRC/openSUSE:Factory/.xkeyboard-config.new.29675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkeyboard-config"
Tue Dec 10 23:43:07 2024 rev:107 rq:1229400 version:2.42
Changes:
--------
--- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes
2024-10-31 16:08:50.653753887 +0100
+++
/work/SRC/openSUSE:Factory/.xkeyboard-config.new.29675/xkeyboard-config.changes
2024-12-10 23:43:17.307944137 +0100
@@ -1,0 +2,6 @@
+Mon Dec 9 13:39:32 UTC 2024 - Stefan Dirsch <[email protected]>
+
+- python-3.11.patch/buildrequire python311-base
+ * fixes build on Leap 15.6 and sle15-sp7
+
+-------------------------------------------------------------------
New:
----
python-3.11.patch
BETA DEBUG BEGIN:
New:
- python-3.11.patch/buildrequire python311-base
* fixes build on Leap 15.6 and sle15-sp7
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xkeyboard-config.spec ++++++
--- /var/tmp/diff_new_pack.z2DdbZ/_old 2024-12-10 23:43:17.783963971 +0100
+++ /var/tmp/diff_new_pack.z2DdbZ/_new 2024-12-10 23:43:17.783963971 +0100
@@ -27,11 +27,18 @@
# 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
++++++ python-3.11.patch ++++++
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
