From 873f27cfb08409fb2f69b74ed4b75abd5b651dcabac491a8efb81162a36933a0 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 6 Dec 2022 07:16:10 +0000 Subject: [PATCH] Accepting request 1038176 from home:cgiboudeaux:Qt6:release:pyside Update to 6.4.1 OBS-URL: https://build.opensuse.org/request/show/1038176 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=26 --- 0001-Fix-a-cmake-only-build.patch | 33 +++++++++++++++++++++ 0002-Fix-a-cmake-only-build-amended.patch | 35 +++++++++++++++++++++++ pyside-6.4.0-arm_gles.patch | 30 ------------------- pyside-setup-opensource-src-6.4.0.tar.xz | 3 -- pyside-setup-opensource-src-6.4.1.tar.xz | 3 ++ python3-pyside6.changes | 21 ++++++++++++++ python3-pyside6.spec | 34 +++++++++++----------- 7 files changed, 108 insertions(+), 51 deletions(-) create mode 100644 0001-Fix-a-cmake-only-build.patch create mode 100644 0002-Fix-a-cmake-only-build-amended.patch delete mode 100644 pyside-6.4.0-arm_gles.patch delete mode 100644 pyside-setup-opensource-src-6.4.0.tar.xz create mode 100644 pyside-setup-opensource-src-6.4.1.tar.xz diff --git a/0001-Fix-a-cmake-only-build.patch b/0001-Fix-a-cmake-only-build.patch new file mode 100644 index 0000000..672e58f --- /dev/null +++ b/0001-Fix-a-cmake-only-build.patch @@ -0,0 +1,33 @@ +From 5a5b343c80239aaf75d2a582920b75c8c8058da2 Mon Sep 17 00:00:00 2001 +From: Christian Tismer +Date: Thu, 24 Nov 2022 10:24:58 +0100 +Subject: [PATCH] Fix a cmake-only build + +pyminver was computed by cmake and evaluated by parser.py . +A recent refactoring extracted a computed string in a +wrong way. + +Change-Id: Ia8264294ad0e050863ea912a9fee15792bed8f10 +Pick-to: 6.4 +Fixes: PYSIDE-2127 +Fixes: PYSIDE-2128 +--- + .../files.dir/shibokensupport/signature/parser.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py +index be82a4f..66d79ad 100644 +--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py ++++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py +@@ -69,7 +69,7 @@ def _get_flag_enum_option(): + flag = getattr(sys, sysname) + if not isinstance(flag, int): + flag = True +- p = f"\n *** Python is at version {'.'.join(map(str, pyminver))} now." ++ p = f"\n *** Python is at version {'.'.join(map(str, pyminver or 0))} now." + # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp + if pyminver and pyminver >= (3, 8): + warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed ASAP! ***") +-- +2.38.1 + diff --git a/0002-Fix-a-cmake-only-build-amended.patch b/0002-Fix-a-cmake-only-build-amended.patch new file mode 100644 index 0000000..b20cb51 --- /dev/null +++ b/0002-Fix-a-cmake-only-build-amended.patch @@ -0,0 +1,35 @@ +From 3b61453ba48f40d73aa1ad2c9e5a82a389920d0d Mon Sep 17 00:00:00 2001 +From: Christian Tismer +Date: Thu, 24 Nov 2022 10:24:58 +0100 +Subject: [PATCH 2/2] Fix a cmake-only build, amended + +pyminver was computed by cmake and evaluated by parser.py . +A recent refactoring extracted a computed string in a +wrong way. + +Sorry, a tuple was needed as default. + +Change-Id: Ib837af50f2cd525411a3a641e3ccc7fc99cf866a +Pick-to: 6.4 +Fixes: PYSIDE-2127 +Fixes: PYSIDE-2128 +--- + .../files.dir/shibokensupport/signature/parser.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py +index 66d79ad..5d86b93 100644 +--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py ++++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py +@@ -69,7 +69,7 @@ def _get_flag_enum_option(): + flag = getattr(sys, sysname) + if not isinstance(flag, int): + flag = True +- p = f"\n *** Python is at version {'.'.join(map(str, pyminver or 0))} now." ++ p = f"\n *** Python is at version {'.'.join(map(str, pyminver or (0,)))} now." + # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp + if pyminver and pyminver >= (3, 8): + warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed ASAP! ***") +-- +2.38.1 + diff --git a/pyside-6.4.0-arm_gles.patch b/pyside-6.4.0-arm_gles.patch deleted file mode 100644 index a783927..0000000 --- a/pyside-6.4.0-arm_gles.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 24bd3d5b2ea519900712208aabddee6283c20612 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Mon, 17 Oct 2022 09:54:44 +0200 -Subject: [PATCH] Fix build with OpenGLES - -Add the GLES headers to the system headers so that the integer -typedefs are seen, which is required after -f92cd6b5ac0dc3f97d9693443e6ac5cf966b87ec, -50d0c3c94ff66c104de269f09c08109eb9d0eb3a. - -Fixes: PYSIDE-2084 -Pick-to: 6.4 6.2 -Change-Id: I6036d042765b959e0f8d7258d5d5ba322351f8ec ---- - -diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -index 7887457..512f1a8 100644 ---- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -@@ -807,6 +807,10 @@ - // Resolve OpenGL typedefs although the header is considered a system header. - const QString baseName = clang::baseName(fileName); - if (baseName == u"gl.h" -+ || baseName == u"gl2.h" -+ || baseName == u"gl3.h" -+ || baseName == u"gl31.h" -+ || baseName == u"gl32.h" - || baseName == u"stdint.h" // Windows: int32_t, uint32_t - || baseName == u"stddef.h") { // size_t - return true; diff --git a/pyside-setup-opensource-src-6.4.0.tar.xz b/pyside-setup-opensource-src-6.4.0.tar.xz deleted file mode 100644 index 0b58dbb..0000000 --- a/pyside-setup-opensource-src-6.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcee166a112a7eb04bb58c1164997e1f720c1e3e2ee199ee8c9a70e82f51e321 -size 8551772 diff --git a/pyside-setup-opensource-src-6.4.1.tar.xz b/pyside-setup-opensource-src-6.4.1.tar.xz new file mode 100644 index 0000000..3924bc6 --- /dev/null +++ b/pyside-setup-opensource-src-6.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:807954ce284e1137475f78faf3bcf0ae9d17ec3690d1a43d09c98e973a3d556b +size 8755436 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 4a41b1c..460463a 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 24 08:14:56 UTC 2022 - Christophe Giboudeaux + +- Update to 6.4.1. Check the installed changes-6.4.1 file for the + full list of changes + * The long missing support for __slots__ was finally added + * Documentation builds have been fixed to work with + system-installed versions of Qt 6. + * A bug when passing wrong keyword args to signals has been fixed + * The build with OpenGLES has been fixed + * Crashes when not implementing abstract methods have been + fixed + * Python 3.10 and higher are not compatible to the + __signature__ attribute. This has been fixed by a temporary + patch until the final removal of that attribute. +- Drop patch, merged upstream: + * pyside-6.4.0-arm_gles.patch +- Add patches to fix CMake builds: + * 0001-Fix-a-cmake-only-build.patch + * 0002-Fix-a-cmake-only-build-amended.patch + ------------------------------------------------------------------- Sun Oct 16 07:04:40 UTC 2022 - Christophe Giboudeaux diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 3e597d1..313eac8 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -25,7 +25,7 @@ %endif # Name: python3-%{pyside_flavor} -Version: 6.4.0 +Version: 6.4.1 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,8 +35,9 @@ 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-UPSTREAM -Patch2: pyside-6.4.0-arm_gles.patch +# PATCH-FIX-UPSTREAM -- Fixes the CMake builds +Patch2: 0001-Fix-a-cmake-only-build.patch +Patch3: 0002-Fix-a-cmake-only-build-amended.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes @@ -53,6 +54,8 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) # /SECTION %if "%{pyside_flavor}" == "pyside6" +# For the registry_existence test +BuildRequires: python3-distro BuildRequires: cmake(Shiboken6) = %{version} # SECTION test_dependencies BuildRequires: Mesa-dri @@ -79,10 +82,7 @@ BuildRequires: cmake(Qt63DRender) BuildRequires: cmake(Qt6Bluetooth) BuildRequires: cmake(Qt6Charts) BuildRequires: cmake(Qt6DBus) -# Skip Qt6DataVisualization on armv7l due to boo#1204267 -%ifnarch %{arm} BuildRequires: cmake(Qt6DataVisualization) -%endif BuildRequires: cmake(Qt6Designer) BuildRequires: cmake(Qt6Help) BuildRequires: cmake(Qt6HttpServer) @@ -141,7 +141,7 @@ _libsuffix=$(echo %{_lib} | cut -b4-) %global __qt6_builddir %{pyside_flavor} # Fix installation dir -sed -i 's#purelib#platlib#' sources/{pyside6/cmake/PySideSetup.cmake,shiboken6/cmake/ShibokenHelpers.cmake} +sed -i 's#purelib#platlib#' sources/shiboken6/cmake/ShibokenHelpers.cmake pushd sources/%{pyside_flavor} @@ -234,19 +234,18 @@ 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 +%{_libdir}/lib%{pyside_flavor}.abi3.so.* %if "%{pyside_flavor}" == "shiboken6" %{_bindir}/shiboken6 %{_bindir}/shiboken_tool.py %{python_sitearch}/shiboken6/ %{python_sitearch}/shiboken6_generator/ -%else -%{python_sitearch}/PySide6/ +%endif +%if "%{pyside_flavor}" == "pyside6" +%{_libdir}/libpyside6qml.abi3.so.* %dir %{_qt6_pluginsdir}/designer %{_qt6_pluginsdir}/designer/libPySidePlugin.so +%{python_sitearch}/PySide6/ %endif %files devel @@ -254,16 +253,15 @@ popd %{_includedir}/shiboken6/ %{_qt6_cmakedir}/Shiboken6/ %{_qt6_cmakedir}/Shiboken6Tools/ -%else +%endif +%if "%{pyside_flavor}" == "pyside6" %{_datadir}/PySide6/ %{_includedir}/PySide6/ +%{_libdir}/libpyside6qml.abi3.so %{_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}/lib%{pyside_flavor}.abi3.so %{_libdir}/pkgconfig/%{pyside_flavor}.pc %changelog