From e030e6651529d0caced69fbc28cc4029f58e06308c6c297624669d77543dc2e9 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 20 Feb 2024 14:23:50 +0000 Subject: [PATCH] Accepting request 1147368 from home:krop:Qt6:Extra Update to 6.6.2 OBS-URL: https://build.opensuse.org/request/show/1147368 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=59 --- 0001-Always-link-to-python-libraries.patch | 26 +++++----------------- pyside-setup-everywhere-src-6.6.1.tar.xz | 3 --- pyside-setup-everywhere-src-6.6.2.tar.xz | 3 +++ python3-pyside6.changes | 9 +++++++- python3-pyside6.spec | 12 ++++++---- 5 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 pyside-setup-everywhere-src-6.6.1.tar.xz create mode 100644 pyside-setup-everywhere-src-6.6.2.tar.xz diff --git a/0001-Always-link-to-python-libraries.patch b/0001-Always-link-to-python-libraries.patch index 36603d8..ed10187 100644 --- a/0001-Always-link-to-python-libraries.patch +++ b/0001-Always-link-to-python-libraries.patch @@ -5,14 +5,11 @@ Subject: [PATCH] Always link to python libraries. Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1 --- - sources/shiboken6/cmake/ShibokenHelpers.cmake | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake -index 87a6762..189d7ab 100644 +index 1a46e5b..6c10c07 100644 --- a/sources/shiboken6/cmake/ShibokenHelpers.cmake +++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake -@@ -310,21 +310,9 @@ macro(shiboken_compute_python_libraries) +@@ -420,13 +420,9 @@ macro(shiboken_compute_python_libraries) "SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries" "IS_CALLED_FROM_EXPORT" "" "" ${ARGN}) @@ -20,23 +17,12 @@ index 87a6762..189d7ab 100644 - set(SHIBOKEN_PYTHON_LIBRARIES "") - endif() - -- if(CMAKE_BUILD_TYPE STREQUAL "Debug") -- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES) -- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES}) -- endif() -- endif() -- -- if(CMAKE_BUILD_TYPE STREQUAL "Release") -- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES) -- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES}) -- endif() +- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES) +- set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES}) - endif() + # Always link to python libraries. -+ message(STATUS "Linking shiboken to ${PYTHON_LIBRARIES}") -+ set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES}) ++ message(STATUS "Linking shiboken to ${Python_LIBRARIES}") ++ set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES}) # If the resulting variable # contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api, --- -2.34.1 - diff --git a/pyside-setup-everywhere-src-6.6.1.tar.xz b/pyside-setup-everywhere-src-6.6.1.tar.xz deleted file mode 100644 index 4683c68..0000000 --- a/pyside-setup-everywhere-src-6.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:341f42483fbe58c88fa5b353eefa83ffcc4ec440bf6e87c1c7ffd278ed54d1ca -size 13887704 diff --git a/pyside-setup-everywhere-src-6.6.2.tar.xz b/pyside-setup-everywhere-src-6.6.2.tar.xz new file mode 100644 index 0000000..c519e9c --- /dev/null +++ b/pyside-setup-everywhere-src-6.6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0 +size 13975896 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index d888b93..98b2023 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 17 17:52:19 UTC 2024 - Christophe Marin + +- Update to 6.6.2. Check the installed changes-6.6.2 file for the + full list of changes +- Rebase 0001-Always-link-to-python-libraries.patch + ------------------------------------------------------------------- Fri Jan 26 12:07:41 UTC 2024 - Ben Greiner @@ -7,7 +14,7 @@ Fri Jan 26 12:07:41 UTC 2024 - Ben Greiner ------------------------------------------------------------------- Thu Dec 7 10:54:43 UTC 2023 - Christophe Marin -- Update to 6.6.1. Check the installed changes-6.6.0 file for the +- Update to 6.6.1. Check the installed changes-6.6.1 file for the full list of changes - Drop patch, merged upstream: * 0001-Fix-QtAsyncio-install-dir.patch diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 997bac5..de88aea 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -43,7 +43,7 @@ ExclusiveArch: donotbuild %endif Name: %{mypython}-%{pyside_flavor} -Version: 6.6.1 +Version: 6.6.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 @@ -160,6 +160,9 @@ Python bindings for the Qt cross-platform application and UI framework %prep %autosetup -p1 -n %{tar_name}-%{version} +# Restore 6.6.1 RPATH value. rpmlint will complain otherwise +sed -i 's#${base}/../shiboken6/##' sources/pyside6/CMakeLists.txt + %build _libsuffix=$(echo %{_lib} | cut -b4-) @@ -179,7 +182,7 @@ pushd sources/%{pyside_flavor} -DCMAKE_C_FLAGS:STRING="" \ -DCMAKE_CXX_FLAGS:STRING="" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="" \ - -DPYTHON_EXECUTABLE:STRING=%{__mypython} \ + -DPython_EXECUTABLE:STRING=%{__mypython} \ -DNUMPY_INCLUDE_DIR:STRING=%{mypython_sitearch}/numpy/core/include \ -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \ %if "%{pyside_flavor}" == "shiboken6" @@ -236,14 +239,15 @@ ctest_exclude_regex="smart_smart_pointer" %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\ %define excluded_tests 1 -# Excluded tests (last update: 2023-10-17) +# Excluded tests (last update: 2024-02-17) # QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer' # QtGui_qpen_test times out # QtMultimediaWidgets_qmultimediawidgets aborts # Qt3DExtras_qt3dextras_test fails on s390x (timeout) and randomly everywhere else (exception) # QtPositioning_positioning fails # QtWidgets_qwidget_test fails randomly -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 +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" # Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts %ifarch aarch64