From 41310788793f045c57966939643a7ba2ae7bda8d03387c8686ec7f34968ed07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Feb 2025 17:25:19 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python3-pyside6 revision 8716313c17a7b4f167e6d4e1d16faedd --- fix-pytest-qt.patch | 6 +++--- pyside-setup-everywhere-src-6.8.1.1.tar.xz | 3 --- pyside-setup-everywhere-src-6.8.2.tar.xz | 3 +++ python3-pyside6.changes | 13 ++++++++++++ python3-pyside6.spec | 23 ++++++++++++++++------ 5 files changed, 36 insertions(+), 12 deletions(-) delete mode 100644 pyside-setup-everywhere-src-6.8.1.1.tar.xz create mode 100644 pyside-setup-everywhere-src-6.8.2.tar.xz diff --git a/fix-pytest-qt.patch b/fix-pytest-qt.patch index 7ad1976..0701c59 100644 --- a/fix-pytest-qt.patch +++ b/fix-pytest-qt.patch @@ -27,11 +27,11 @@ without the first one being processed yet. Submitted to upstream in https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559 diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp -index 13d95fa..228f1e3 100644 +index 1e9cd28..7ccf38a 100644 --- a/sources/pyside6/libpyside/pysidesignal.cpp +++ b/sources/pyside6/libpyside/pysidesignal.cpp -@@ -715,7 +715,7 @@ static PyObject *signalInstanceDisconnect(PyObject *self, PyObject *args) - Shiboken::AutoDecRef pyMethod(PyObject_GetAttr(source->d->source, +@@ -721,7 +721,7 @@ static PyObject *signalInstanceDisconnect(PyObject *self, PyObject *args) + Shiboken::AutoDecRef pyMethod(PyObject_GetAttr(source->d->shared->source, PySide::PySideName::qtDisconnect())); PyObject *result = PyObject_CallObject(pyMethod, tupleArgs); - if (result != Py_True) diff --git a/pyside-setup-everywhere-src-6.8.1.1.tar.xz b/pyside-setup-everywhere-src-6.8.1.1.tar.xz deleted file mode 100644 index e1d13f6..0000000 --- a/pyside-setup-everywhere-src-6.8.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1f198f0a9f6f0e694e3b44406166834e27cffa3f23c5a439c934e5c4faba468 -size 16023376 diff --git a/pyside-setup-everywhere-src-6.8.2.tar.xz b/pyside-setup-everywhere-src-6.8.2.tar.xz new file mode 100644 index 0000000..a6357ea --- /dev/null +++ b/pyside-setup-everywhere-src-6.8.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8 +size 16609596 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 4debc4f..e52f7f8 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 10 14:43:59 UTC 2025 - Andreas Schwab + +- Update test excludes for qemu emulation and riscv64 +- Increase testing timeout to avoid spurious failure of + registry_existence_test + +------------------------------------------------------------------- +Fri Jan 31 12:40:44 UTC 2025 - Christophe Marin + +- Update to 6.8.2. Check the installed changes-6.8.2 file for the + full list of changes + ------------------------------------------------------------------- Tue Jan 14 09:31:54 UTC 2025 - Christophe Marin diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 2b64263..95396a7 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -1,7 +1,7 @@ # # spec file for package python3-pyside6 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define tar_name pyside-setup-everywhere-src -%define tar_version 6.8.1.1 +%define tar_version 6.8.2 %global flavor @BUILD_FLAVOR@%{nil} %if "%flavor" == "" @@ -43,7 +43,7 @@ ExclusiveArch: donotbuild %endif Name: %{mypython}-%{pyside_flavor} -Version: 6.8.1 +Version: 6.8.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 @@ -194,7 +194,9 @@ numpyinc=$(%{__mypython} -c 'import numpy; print(numpy.get_include())') %if "%{pyside_flavor}" == "shiboken6" -DCMAKE_SKIP_RPATH:BOOL=ON \ %endif - -DQFP_NO_STRIP:BOOL=ON + -DQFP_NO_STRIP:BOOL=ON \ + -DCTEST_TESTING_TIMEOUT=120 \ + %{nil} %{qt6_build} @@ -256,11 +258,20 @@ ctest_exclude_regex="smart_smart_pointer" # QtCore_qoperatingsystemversion_test fails after https://code.qt.io/cgit/qt/qtbase.git/commit/?id=1214edc ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test|QtPositioning_positioning|pyside6-deploy_test_pyside6_deploy|QtWidgets_qwidget_test|pyside6-android-deploy_test_pyside6_android_deploy|qoperatingsystemversion" -# registry_existence_test randomly times out and QtWebEngineCore_web_engine_custom_scheme asserts +# QtWebEngineCore_web_engine_custom_scheme asserts # QtWebEngineCore_qwebenginecookiestore_test, pysidetest_new_inherited_functions_test fail with a mesa error ('MESA: error: ZINK: vkCreateInstance failed (VK_ERROR_INCOMPATIBLE_DRIVER)') # QtWidgets_bug_668, QtWidgets_bug_728 segfault %ifarch aarch64 -ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test|QtWebEngineCore_web_engine_custom_scheme|QtWebEngineCore_qwebenginecookiestore_test|pysidetest_new_inherited_functions_test|QtWidgets_bug_668|QtWidgets_bug_728" +ctest_exclude_regex="$ctest_exclude_regex|QtWebEngineCore_web_engine_custom_scheme|QtWebEngineCore_qwebenginecookiestore_test|pysidetest_new_inherited_functions_test|QtWidgets_bug_668|QtWidgets_bug_728" +%endif +# QtWebEngineCore_web_engine_custom_scheme is flaky +# QtQml_qquickitem_grabToImage fails for unknown reasons +%ifarch riscv64 +ctest_exclude_regex+="|QtWebEngineCore_web_engine_custom_scheme|QtQml_qquickitem_grabToImage" +%endif +# qemu linux-user emulation is always multi-threaded, sandbox refuses to start +%if 0%{?qemu_user_space_build} +ctest_exclude_regex+="|QtWebEngineCore_web_engine_custom_scheme|QtWebEngineCore_qwebenginecookiestore_test|QtWebEngineWidgets_pyside-474-qtwebengineview" %endif %endif