From 93ae489ea2818ac668bce975b72aa0949a904f46c644763e7b43e4f074ab8f98 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 27 Jul 2023 12:15:57 +0000 Subject: [PATCH] Accepting request 1100916 from home:krop:Qt6:Extra Update to 6.5.2 OBS-URL: https://build.opensuse.org/request/show/1100916 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=43 --- ...-CMake-Fix-installation-of-pyi-files.patch | 37 ------------------- pyside-setup-everywhere-src-6.5.1.tar.xz | 3 -- pyside-setup-everywhere-src-6.5.2.tar.xz | 3 ++ python3-pyside6.changes | 8 ++++ python3-pyside6.spec | 4 +- 5 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 0001-CMake-Fix-installation-of-pyi-files.patch delete mode 100644 pyside-setup-everywhere-src-6.5.1.tar.xz create mode 100644 pyside-setup-everywhere-src-6.5.2.tar.xz diff --git a/0001-CMake-Fix-installation-of-pyi-files.patch b/0001-CMake-Fix-installation-of-pyi-files.patch deleted file mode 100644 index 54c0fda..0000000 --- a/0001-CMake-Fix-installation-of-pyi-files.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7a3a196a7733e5af18881c22b9082bcc91f992ca Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Tue, 30 May 2023 11:02:03 +0200 -Subject: [PATCH] CMake: Fix installation of pyi files - -'file(GLOB ...)' cannot be used since these files are generated -at build time. - -Patch by Julien Schueller. - -Fixes: PYSIDE-2184 -Pick-to: 6.5 - ---- - sources/pyside6/cmake/Macros/PySideModules.cmake | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake -index d86b993..463c609 100644 ---- a/sources/pyside6/cmake/Macros/PySideModules.cmake -+++ b/sources/pyside6/cmake/Macros/PySideModules.cmake -@@ -259,11 +259,7 @@ macro(create_pyside_module) - ${generate_pyi_options}) - add_dependencies("${module_NAME}_pyi" ${module_NAME}) - -- file(GLOB hinting_stub_files -- RELATIVE -- "${CMAKE_CURRENT_BINARY_DIR}/PySide6" -- "${CMAKE_CURRENT_BINARY_DIR}/PySide6/*.pyi") -- install(FILES ${hinting_stub_files} -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../${module_NAME}.pyi" - DESTINATION "${PYTHON_SITE_PACKAGES}/PySide6") - endif() - --- -2.40.1 - diff --git a/pyside-setup-everywhere-src-6.5.1.tar.xz b/pyside-setup-everywhere-src-6.5.1.tar.xz deleted file mode 100644 index 868fb62..0000000 --- a/pyside-setup-everywhere-src-6.5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc9153cbcc0cd234f3955c5eb90fe1191060b026adc7ea348fd6a6a9868bb8fe -size 13565252 diff --git a/pyside-setup-everywhere-src-6.5.2.tar.xz b/pyside-setup-everywhere-src-6.5.2.tar.xz new file mode 100644 index 0000000..9d52dc7 --- /dev/null +++ b/pyside-setup-everywhere-src-6.5.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90dbf1d14fcd41c98a7cbea44b8a4951e10d0b798e154749756e4946654d1ba8 +size 13576204 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index a1a0c97..eebdbb1 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 26 10:48:26 UTC 2023 - Christophe Marin + +- Update to 6.5.2. Check the installed changes-6.5.2 file for the + full list of changes +- Drop patch, merged upstream: + * 0001-CMake-Fix-installation-of-pyi-files.patch + ------------------------------------------------------------------- Tue May 30 08:23:43 UTC 2023 - Christophe Marin diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 3c62560..331fded 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -26,7 +26,7 @@ %endif # Name: python3-%{pyside_flavor} -Version: 6.5.1 +Version: 6.5.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 @@ -34,8 +34,6 @@ URL: https://www.qt.io Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: 0001-Always-link-to-python-libraries.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-CMake-Fix-installation-of-pyi-files.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes