Accepting request 1058032 from KDE:Qt6

Update to 6.4.2 (forwarded request 1058031 from krop)

OBS-URL: https://build.opensuse.org/request/show/1058032
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=14

0001-Fix-a-cmake-only-build.patch

@@ -1,33 +0,0 @@
-From 5a5b343c80239aaf75d2a582920b75c8c8058da2 Mon Sep 17 00:00:00 2001
-From: Christian Tismer <tismer@stackless.com>
-Date: Thu, 24 Nov 2022 10:24:58 +0100
-Subject: [PATCH] Fix a cmake-only build
-
-pyminver was computed by cmake and evaluated by parser.py .
-A recent refactoring extracted a computed string in a
-wrong way.
-
-Change-Id: Ia8264294ad0e050863ea912a9fee15792bed8f10
-Pick-to: 6.4
-Fixes: PYSIDE-2127
-Fixes: PYSIDE-2128
----
- .../files.dir/shibokensupport/signature/parser.py               | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-index be82a4f..66d79ad 100644
---- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-@@ -69,7 +69,7 @@ def _get_flag_enum_option():
-         flag = getattr(sys, sysname)
-         if not isinstance(flag, int):
-             flag = True
--    p = f"\n    *** Python is at version {'.'.join(map(str, pyminver))} now."
-+    p = f"\n    *** Python is at version {'.'.join(map(str, pyminver or 0))} now."
-     # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp
-     if pyminver and pyminver >= (3, 8):
-         warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed ASAP! ***")
--- 
-2.38.1
-

0002-Fix-a-cmake-only-build-amended.patch

@@ -1,35 +0,0 @@
-From 3b61453ba48f40d73aa1ad2c9e5a82a389920d0d Mon Sep 17 00:00:00 2001
-From: Christian Tismer <tismer@stackless.com>
-Date: Thu, 24 Nov 2022 10:24:58 +0100
-Subject: [PATCH 2/2] Fix a cmake-only build, amended
-
-pyminver was computed by cmake and evaluated by parser.py .
-A recent refactoring extracted a computed string in a
-wrong way.
-
-Sorry, a tuple was needed as default.
-
-Change-Id: Ib837af50f2cd525411a3a641e3ccc7fc99cf866a
-Pick-to: 6.4
-Fixes: PYSIDE-2127
-Fixes: PYSIDE-2128
----
- .../files.dir/shibokensupport/signature/parser.py               | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-index 66d79ad..5d86b93 100644
---- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
-@@ -69,7 +69,7 @@ def _get_flag_enum_option():
-         flag = getattr(sys, sysname)
-         if not isinstance(flag, int):
-             flag = True
--    p = f"\n    *** Python is at version {'.'.join(map(str, pyminver or 0))} now."
-+    p = f"\n    *** Python is at version {'.'.join(map(str, pyminver or (0,)))} now."
-     # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp
-     if pyminver and pyminver >= (3, 8):
-         warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed ASAP! ***")
--- 
-2.38.1
-

pyside-setup-opensource-src-6.4.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:807954ce284e1137475f78faf3bcf0ae9d17ec3690d1a43d09c98e973a3d556b
-size 8755436

pyside-setup-opensource-src-6.4.2.tar.xz

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

python3-pyside6.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 11 11:11:25 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.4.2. Check the installed changes-6.4.2 file for the
+  full list of changes
+- Drop patches, merged upstream:
+  * 0001-Fix-a-cmake-only-build.patch
+  * 0002-Fix-a-cmake-only-build-amended.patch
+
 -------------------------------------------------------------------
 Tue Dec  6 07:34:22 UTC 2022 - Christophe Marin <christophe@krop.fr>
 

python3-pyside6.spec

@@ -25,7 +25,7 @@
 %endif
 #
 Name:           python3-%{pyside_flavor}
-Version:        6.4.1
+Version:        6.4.2
 Release:        0
 Summary:        Python bindings for Qt 6
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -35,9 +35,6 @@ Source:         https://download.qt.io/official_releases/QtForPython/pyside6/PyS
 Patch0:         0001-Don-t-install-CMake-files-into-versioned-directories.patch
 # PATCH-FIX-OPENSUSE
 Patch1:         0001-Always-link-to-python-libraries.patch
-# PATCH-FIX-UPSTREAM -- Fixes the CMake builds
-Patch2:         0001-Fix-a-cmake-only-build.patch
-Patch3:         0002-Fix-a-cmake-only-build-amended.patch
 # SECTION common_dependencies
 BuildRequires:  clang-devel
 BuildRequires:  fdupes
@@ -207,15 +204,13 @@ done
 %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\
 
 %define excluded_tests 1
-# Excluded tests (last update: 2022-12-06)
+# Excluded tests (last update: 2023-01-12)
 # QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer'
 # QtGui_qpen_test times out
 # QtMultimediaWidgets_qmultimediawidgets aborts
-ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets"
+# Qt3DExtras_qt3dextras_test fails on s390x (timeout) and randomly everywhere else (exception)
-# Qt3DExtras_qt3dextras_test fails on s390x (timeout)
+ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test"
-%ifarch s390x
+
-ctest_exclude_regex="$ctest_exclude_regex|Qt3DExtras_qt3dextras_test"
-%endif
 # Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts
 %ifarch aarch64
 ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test|QtWebEngineCore_web_engine_custom_scheme"