diff --git a/0001-Don-t-install-CMake-files-into-versioned-directories.patch b/0001-Don-t-install-CMake-files-into-versioned-directories.patch index f8d6935..38e5ede 100644 --- a/0001-Don-t-install-CMake-files-into-versioned-directories.patch +++ b/0001-Don-t-install-CMake-files-into-versioned-directories.patch @@ -1,4 +1,4 @@ -From 01b6cb4089b1ccc4617f2e4d2cce241e2c111069 Mon Sep 17 00:00:00 2001 +From d64f9ed25aba35e44f6397461b66d49545f65c07 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 25 Apr 2021 16:14:31 +0200 Subject: [PATCH] Don't install CMake files into versioned directories @@ -6,15 +6,16 @@ Subject: [PATCH] Don't install CMake files into versioned directories Experience shows this causes issues. --- sources/pyside6/libpyside/CMakeLists.txt | 10 +++++----- + sources/pyside6/libpysideqml/CMakeLists.txt | 10 +++++----- sources/shiboken6/data/CMakeLists.txt | 10 +++++----- sources/shiboken6/libshiboken/CMakeLists.txt | 2 +- - 3 files changed, 11 insertions(+), 11 deletions(-) + 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt -index dca469e..e4802ec 100644 +index 0b2f7a097..a8807b9d7 100644 --- a/sources/pyside6/libpyside/CMakeLists.txt +++ b/sources/pyside6/libpyside/CMakeLists.txt -@@ -157,7 +157,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue") +@@ -153,7 +153,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config-spec.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake" @@ -23,7 +24,7 @@ index dca469e..e4802ec 100644 PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE ) -@@ -174,16 +174,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets +@@ -170,16 +170,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION bin) install(EXPORT PySide6Targets NAMESPACE PySide6:: @@ -44,11 +45,43 @@ index dca469e..e4802ec 100644 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake" - DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}") + DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6") +diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt +index 42238c8cb..580c8fdff 100644 +--- a/sources/pyside6/libpysideqml/CMakeLists.txt ++++ b/sources/pyside6/libpysideqml/CMakeLists.txt +@@ -63,7 +63,7 @@ qfp_strip_library("pyside6qml") + configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig-spec.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake" +- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}" ++ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml" + ) + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig.cmake.in" +@@ -79,14 +79,14 @@ install(TARGETS pyside6qml EXPORT PySide6QmlTargets + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" + RUNTIME DESTINATION bin) + install(EXPORT PySide6QmlTargets NAMESPACE PySide6Qml:: +- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}") ++ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfig.cmake" +- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}") ++ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake" +- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}") ++ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfigVersion.cmake" +- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}") ++ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt -index 6dedb13..4101f94 100644 +index 80dd7ca36..88d9487da 100644 --- a/sources/shiboken6/data/CMakeLists.txt +++ b/sources/shiboken6/data/CMakeLists.txt -@@ -33,7 +33,7 @@ endif() +@@ -29,7 +29,7 @@ endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config-spec.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake" @@ -57,7 +90,7 @@ index 6dedb13..4101f94 100644 PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR ) -@@ -45,16 +45,16 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in" +@@ -41,16 +41,16 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake" @@ -79,15 +112,15 @@ index 6dedb13..4101f94 100644 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt -index da1b562..09a8e36 100644 +index c65dcdb44..7447d1d71 100644 --- a/sources/shiboken6/libshiboken/CMakeLists.txt +++ b/sources/shiboken6/libshiboken/CMakeLists.txt -@@ -159,4 +159,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets +@@ -179,4 +179,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION bin) install(EXPORT Shiboken6Targets NAMESPACE Shiboken6:: - DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}) + DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6) -- -2.34.1 +2.35.1 diff --git a/0001-Work-around-build-issue-in-pyside-6.3.patch b/0001-Work-around-build-issue-in-pyside-6.3.patch new file mode 100644 index 0000000..f956f70 --- /dev/null +++ b/0001-Work-around-build-issue-in-pyside-6.3.patch @@ -0,0 +1,41 @@ +From c9a2328c8264b8cc9cc2dcf31d49bd8923c05bf7 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Sun, 17 Apr 2022 15:16:18 +0200 +Subject: [PATCH] Work around build issue in pyside 6.3 + +Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1890 + +Change-Id: I084b5d96b71b3b8468008cd415b3102d3a7918d7 +--- + sources/pyside6/PySide6/CMakeLists.txt | 1 + + sources/pyside6/PySide6/__init__.py.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt +index 95693ff67..8c53341b3 100644 +--- a/sources/pyside6/PySide6/CMakeLists.txt ++++ b/sources/pyside6/PySide6/CMakeLists.txt +@@ -4,6 +4,7 @@ project(pyside6) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h" @ONLY) + ++get_filename_component(_build_dir_name ${CMAKE_BINARY_DIR} NAME) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" + "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" +diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in +index d8439985d..ba748a91f 100644 +--- a/sources/pyside6/PySide6/__init__.py.in ++++ b/sources/pyside6/PySide6/__init__.py.in +@@ -123,7 +123,7 @@ def _find_all_qt_modules(): + location = Path(__file__).resolve().parent + + # Note: We should _not_ call this function while still building, but use the existing value! +- in_build = location.parents[1].name == "build" ++ in_build = location.parents[1].name == "@_build_dir_name@" + if in_build: + return __all__ + +-- +2.35.1 + diff --git a/pyside-setup-opensource-src-6.2.4.tar.xz b/pyside-setup-opensource-src-6.2.4.tar.xz deleted file mode 100644 index d3b12d0..0000000 --- a/pyside-setup-opensource-src-6.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9680ff298ee8b01a68de20911c60da04568a0918b3062d4c571ef170b4603ff -size 7630376 diff --git a/pyside-setup-opensource-src-6.3.0.tar.xz b/pyside-setup-opensource-src-6.3.0.tar.xz new file mode 100644 index 0000000..8f7760f --- /dev/null +++ b/pyside-setup-opensource-src-6.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2 +size 7648368 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index c9d74ab..6387baa 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sun Apr 17 13:25:54 UTC 2022 - Christophe Giboudeaux + +- Add patch to fix build: + * 0001-Work-around-build-issue-in-pyside-6.3.patch +- Rebase patch: + * 0001-Don-t-install-CMake-files-into-versioned-directories.patch + +------------------------------------------------------------------- +Tue Apr 12 10:26:46 UTC 2022 - Christophe Giboudeaux + +- Update to 6.3.0. Check the installed changes-6.3.0 file for the + complete list of changes. + * The QtNfc module has been added. + * New QML tools have been added: pyside6-metaobjectdump, + pyside6-qmltyperegistrar and pyside6-qmllint. + * Several class decorators have been added for QML: QmlAttached, + QmlExtended, QmlForeign, QmlNamedElement, QmlSingleton and + QmlUncreatable. + * class QPyQmlPropertyValueSource for implementing QML value + property sources has been added. + * QML code has been split out from libpyside into a new library + libpysideqml. libpyside thus no longer depends on QtQml and + pyside.h no longer includes QML headers. pyside.h has been + split into smaller headers. + * A context manager for override cursors has been added. It is + now possible to write code like: with + QApplication.setOverrideCursor(Qt.WaitCursor):... +- Don't build QtWebEngine bindings on 32 bits archs. + ------------------------------------------------------------------- Wed Mar 23 11:37:45 UTC 2022 - Christophe Giboudeaux diff --git a/python3-pyside6.spec b/python3-pyside6.spec index ef9da62..2737e0d 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -1,7 +1,7 @@ # # spec file for package python3-pyside6 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %endif # Name: python3-%{pyside_flavor} -Version: 6.2.4 +Version: 6.3.0 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,6 +35,8 @@ 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-OPENSUSE +Patch2: 0001-Work-around-build-issue-in-pyside-6.3.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes @@ -100,7 +102,7 @@ BuildRequires: cmake(Qt6SvgWidgets) BuildRequires: cmake(Qt6UiPlugin) BuildRequires: cmake(Qt6UiTools) BuildRequires: cmake(Qt6WebChannel) -%ifnarch ppc ppc64 ppc64le s390 s390x +%ifnarch %{ix86} armv7l armv7hl ppc ppc64 ppc64le s390 s390x BuildRequires: cmake(Qt6WebEngineCore) BuildRequires: cmake(Qt6WebEngineQuick) BuildRequires: cmake(Qt6WebEngineWidgets) @@ -143,7 +145,8 @@ pushd sources/%{pyside_flavor} -DCMAKE_EXE_LINKER_FLAGS:STRING="" \ -DPYTHON_EXECUTABLE:STRING=python3 \ -DNUMPY_INCLUDE_DIR:STRING=%{python_sitearch}/numpy/core/include \ - -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON + -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \ + -DQFP_NO_STRIP:BOOL=ON %{qt6_build} @@ -158,7 +161,7 @@ popd %fdupes -s %{buildroot}%{python_sitearch} -sed -i 's#env python#python3#' %{buildroot}%{_bindir}/shiboken_tool.py +sed -i 's#env python$#python3#' %{buildroot}%{_bindir}/shiboken_tool.py %else @@ -206,7 +209,11 @@ popd %files %license sources/%{pyside_flavor}/COPYING* +%doc doc/changelogs/changes-* %{_libdir}/lib%{pyside_flavor}.%{py3_soflags}.so.* +%if "%{pyside_flavor}" == "pyside6" +%{_libdir}/libpyside6qml.%{py3_soflags}.so.* +%endif %if "%{pyside_flavor}" == "shiboken6" %{_bindir}/shiboken6 %{_bindir}/shiboken_tool.py @@ -222,12 +229,17 @@ popd %if "%{pyside_flavor}" == "shiboken6" %{_includedir}/shiboken6/ %{_qt6_cmakedir}/Shiboken6/ +%{_qt6_cmakedir}/Shiboken6Tools/ %else %{_datadir}/PySide6/ %{_includedir}/PySide6/ %{_qt6_cmakedir}/PySide6/ +%{_qt6_cmakedir}/PySide6Qml/ %endif %{_libdir}/lib%{pyside_flavor}.%{py3_soflags}.so +%if "%{pyside_flavor}" == "pyside6" +%{_libdir}/libpyside6qml.%{py3_soflags}.so +%endif %{_libdir}/pkgconfig/%{pyside_flavor}.pc %changelog