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
This commit is contained in:
parent
144440012d
commit
e030e66515
@ -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
|
||||
|
||||
|
BIN
pyside-setup-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
BIN
pyside-setup-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
pyside-setup-everywhere-src-6.6.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
pyside-setup-everywhere-src-6.6.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 17 17:52:19 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- 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 <code@bnavigator.de>
|
||||
|
||||
@ -7,7 +14,7 @@ Fri Jan 26 12:07:41 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 7 10:54:43 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- 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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user