SLFO-pool/python3-pyside6
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python3-pyside6 revision 38a588bc3bdb788cd5f23b8032c5e649

Browse Source
This commit is contained in:
Adrian Schröter 2024-08-21 17:21:57 +02:00
parent a2505245ef
commit 7d0cb52899
5 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Always-link-to-python-libraries.patch
View File

@ -5,14 +5,11 @@ Subject: [PATCH] Always link to python libraries.
Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1 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 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 --- a/sources/shiboken6/cmake/ShibokenHelpers.cmake
+++ b/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" "SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries"
"IS_CALLED_FROM_EXPORT" "" "" ${ARGN}) "IS_CALLED_FROM_EXPORT" "" "" ${ARGN})
@ -20,23 +17,12 @@ index 87a6762..189d7ab 100644
- set(SHIBOKEN_PYTHON_LIBRARIES "") - set(SHIBOKEN_PYTHON_LIBRARIES "")
- endif() - endif()
- -
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES) - if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES)
- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES}) - set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES})
- endif()
- endif()
-
- if(CMAKE_BUILD_TYPE STREQUAL "Release")
- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES)
- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
- endif()
- endif() - endif()
+ # Always link to python libraries. + # Always link to python libraries.
+ message(STATUS "Linking shiboken to ${PYTHON_LIBRARIES}") + message(STATUS "Linking shiboken to ${Python_LIBRARIES}")
+ set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES}) + set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES})
# If the resulting variable # If the resulting variable
# contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api, # 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)
View File

Binary file not shown.

BIN
pyside-setup-everywhere-src-6.6.2.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

26
python3-pyside6.changes
View File

@ -1,7 +1,31 @@
-------------------------------------------------------------------
Tue Aug 6 16:43:26 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Revert change from Jan 26 to keep creating packages with python3
prefix.
-------------------------------------------------------------------
Wed Mar 27 08:26:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Exclude a broken pyside test since Qt 6.6.3 release
-------------------------------------------------------------------
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>
- Enable SLE15 python module for a more modern python than 3.6
- Use primary_python flavor for Tumbleweed (which provides python3)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 7 10:54:43 UTC 2023 - Christophe Marin <christophe@krop.fr> 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 full list of changes
- Drop patch, merged upstream: - Drop patch, merged upstream:
* 0001-Fix-QtAsyncio-install-dir.patch * 0001-Fix-QtAsyncio-install-dir.patch

37
python3-pyside6.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python3-pyside6 # spec file for package python3-pyside6
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,9 +24,10 @@
%else %else
%global pyside_flavor pyside6 %global pyside_flavor pyside6
%endif %endif
# %define mypython python3
Name: python3-%{pyside_flavor}
Version: 6.6.1 Name: %{mypython}-%{pyside_flavor}
Version: 6.6.2
Release: 0 Release: 0
Summary: Python bindings for Qt 6 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 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
@ -36,13 +37,13 @@ Source: https://download.qt.io/official_releases/QtForPython/pyside6/PyS
Patch0: 0001-Always-link-to-python-libraries.patch Patch0: 0001-Always-link-to-python-libraries.patch
# SECTION common_dependencies # SECTION common_dependencies
BuildRequires: clang-devel BuildRequires: clang-devel
BuildRequires: %{mypython}-Sphinx
BuildRequires: %{mypython}-devel >= 3.7
BuildRequires: %{mypython}-numpy-devel
BuildRequires: %{mypython}-setuptools
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python3-Sphinx
BuildRequires: python3-devel >= 3.7
BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools
BuildRequires: qt6-macros BuildRequires: qt6-macros
BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6Test)
@ -52,8 +53,8 @@ BuildRequires: pkgconfig(libxslt)
# /SECTION # /SECTION
%if "%{pyside_flavor}" == "pyside6" %if "%{pyside_flavor}" == "pyside6"
# For the registry_existence test # For the registry_existence test
BuildRequires: python3-distro BuildRequires: %{mypython}-distro
BuildRequires: cmake(Shiboken6) = %{version} BuildRequires: %{mypython}-shiboken6-devel = %{version}
# SECTION test_dependencies # SECTION test_dependencies
BuildRequires: Mesa-dri BuildRequires: Mesa-dri
BuildRequires: qt6-location BuildRequires: qt6-location
@ -70,6 +71,7 @@ BuildRequires: cmake(Qt6Sql)
BuildRequires: cmake(Qt6Widgets) BuildRequires: cmake(Qt6Widgets)
# /SECTION # /SECTION
# SECTION optional_modules # SECTION optional_modules
BuildRequires: qt6-qml-private-devel
BuildRequires: cmake(Qt63DAnimation) BuildRequires: cmake(Qt63DAnimation)
BuildRequires: cmake(Qt63DCore) BuildRequires: cmake(Qt63DCore)
BuildRequires: cmake(Qt63DExtras) BuildRequires: cmake(Qt63DExtras)
@ -88,7 +90,6 @@ BuildRequires: cmake(Qt6Location)
BuildRequires: cmake(Qt6Multimedia) BuildRequires: cmake(Qt6Multimedia)
BuildRequires: cmake(Qt6MultimediaWidgets) BuildRequires: cmake(Qt6MultimediaWidgets)
BuildRequires: cmake(Qt6NetworkAuth) BuildRequires: cmake(Qt6NetworkAuth)
BuildRequires: qt6-qml-private-devel
BuildRequires: cmake(Qt6OpenGL) BuildRequires: cmake(Qt6OpenGL)
BuildRequires: cmake(Qt6OpenGLWidgets) BuildRequires: cmake(Qt6OpenGLWidgets)
BuildRequires: cmake(Qt6Positioning) BuildRequires: cmake(Qt6Positioning)
@ -110,7 +111,7 @@ BuildRequires: cmake(Qt6TextToSpeech)
BuildRequires: cmake(Qt6UiPlugin) BuildRequires: cmake(Qt6UiPlugin)
BuildRequires: cmake(Qt6UiTools) BuildRequires: cmake(Qt6UiTools)
BuildRequires: cmake(Qt6WebChannel) BuildRequires: cmake(Qt6WebChannel)
%ifnarch %{ix86} armv7l armv7hl ppc ppc64 ppc64le s390 s390x %ifarch x86_64 %x86_64 aarch64 riscv64
BuildRequires: cmake(Qt6Pdf) BuildRequires: cmake(Qt6Pdf)
BuildRequires: cmake(Qt6PdfWidgets) BuildRequires: cmake(Qt6PdfWidgets)
BuildRequires: cmake(Qt6WebEngineCore) BuildRequires: cmake(Qt6WebEngineCore)
@ -119,6 +120,7 @@ BuildRequires: cmake(Qt6WebEngineWidgets)
%endif %endif
BuildRequires: cmake(Qt6WebSockets) BuildRequires: cmake(Qt6WebSockets)
# /SECTION # /SECTION
Requires: %{mypython}-shiboken6
%endif %endif
%description %description
@ -134,6 +136,9 @@ Python bindings for the Qt cross-platform application and UI framework
%prep %prep
%autosetup -p1 -n %{tar_name}-%{version} %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 %build
_libsuffix=$(echo %{_lib} | cut -b4-) _libsuffix=$(echo %{_lib} | cut -b4-)
@ -153,7 +158,7 @@ pushd sources/%{pyside_flavor}
-DCMAKE_C_FLAGS:STRING="" \ -DCMAKE_C_FLAGS:STRING="" \
-DCMAKE_CXX_FLAGS:STRING="" \ -DCMAKE_CXX_FLAGS:STRING="" \
-DCMAKE_EXE_LINKER_FLAGS:STRING="" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="" \
-DPYTHON_EXECUTABLE:STRING=python3 \ -DPython_EXECUTABLE:STRING=python3 \
-DNUMPY_INCLUDE_DIR:STRING=%{python_sitearch}/numpy/core/include \ -DNUMPY_INCLUDE_DIR:STRING=%{python_sitearch}/numpy/core/include \
-DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \ -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \
%if "%{pyside_flavor}" == "shiboken6" %if "%{pyside_flavor}" == "shiboken6"
@ -215,14 +220,16 @@ ctest_exclude_regex="smart_smart_pointer"
%define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\ %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\
%define excluded_tests 1 %define excluded_tests 1
# Excluded tests (last update: 2023-10-17) # Excluded tests (last update: 2024-03-27)
# QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer' # QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer'
# QtGui_qpen_test times out # QtGui_qpen_test times out
# QtMultimediaWidgets_qmultimediawidgets aborts # QtMultimediaWidgets_qmultimediawidgets aborts
# Qt3DExtras_qt3dextras_test fails on s390x (timeout) and randomly everywhere else (exception) # Qt3DExtras_qt3dextras_test fails on s390x (timeout) and randomly everywhere else (exception)
# QtPositioning_positioning fails # QtPositioning_positioning fails
# QtWidgets_qwidget_test fails randomly # 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
# 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"
# Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts # Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts
%ifarch aarch64 %ifarch aarch64