From affa00a1b49feb2b4e42f984f1f7a3a16c22ebc07c332c83b520c4addfede27d Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 10 Dec 2023 10:44:39 +0000 Subject: [PATCH] Accepting request 1131610 from home:krop:Qt6:Extra Update to 6.6.1 OBS-URL: https://build.opensuse.org/request/show/1131610 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=53 --- 0001-Fix-QtAsyncio-install-dir.patch | 23 ----------------------- pyside-setup-everywhere-src-6.6.0.tar.xz | 3 --- pyside-setup-everywhere-src-6.6.1.tar.xz | 3 +++ python3-pyside6.changes | 8 ++++++++ python3-pyside6.spec | 9 ++------- 5 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 0001-Fix-QtAsyncio-install-dir.patch delete mode 100644 pyside-setup-everywhere-src-6.6.0.tar.xz create mode 100644 pyside-setup-everywhere-src-6.6.1.tar.xz diff --git a/0001-Fix-QtAsyncio-install-dir.patch b/0001-Fix-QtAsyncio-install-dir.patch deleted file mode 100644 index 9a6ccfa..0000000 --- a/0001-Fix-QtAsyncio-install-dir.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ad548b61d6b011a66bc2004448c00fca595390de Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Wed, 18 Oct 2023 23:10:57 +0200 -Subject: [PATCH] Fix QtAsyncio install dir - -(https://bugreports.qt.io/browse/PYSIDE-2494) ---- - sources/pyside6/PySide6/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt -index e24fdb682..37b7a6c9c 100644 ---- a/sources/pyside6/PySide6/CMakeLists.txt -+++ b/sources/pyside6/PySide6/CMakeLists.txt -@@ -111,4 +111,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h - DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX}) - - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio" -- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -+ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}") --- -2.42.0 - diff --git a/pyside-setup-everywhere-src-6.6.0.tar.xz b/pyside-setup-everywhere-src-6.6.0.tar.xz deleted file mode 100644 index 2e54d4d..0000000 --- a/pyside-setup-everywhere-src-6.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638 -size 14054860 diff --git a/pyside-setup-everywhere-src-6.6.1.tar.xz b/pyside-setup-everywhere-src-6.6.1.tar.xz new file mode 100644 index 0000000..4683c68 --- /dev/null +++ b/pyside-setup-everywhere-src-6.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:341f42483fbe58c88fa5b353eefa83ffcc4ec440bf6e87c1c7ffd278ed54d1ca +size 13887704 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 2162a50..37ebd4a 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 7 10:54:43 UTC 2023 - Christophe Marin + +- Update to 6.6.1. Check the installed changes-6.6.0 file for the + full list of changes +- Drop patch, merged upstream: + * 0001-Fix-QtAsyncio-install-dir.patch + ------------------------------------------------------------------- Tue Oct 17 10:35:38 UTC 2023 - Christophe Marin diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 8cdb207..96b80fd 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -26,7 +26,7 @@ %endif # Name: python3-%{pyside_flavor} -Version: 6.6.0 +Version: 6.6.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 @@ -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-Fix-QtAsyncio-install-dir.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes @@ -133,7 +131,7 @@ Requires: %{name} = %{version} Python bindings for the Qt cross-platform application and UI framework %prep -%autosetup -p1 -n %{tar_name}-%{short_version} +%autosetup -p1 -n %{tar_name}-%{version} %build _libsuffix=$(echo %{_lib} | cut -b4-) @@ -183,9 +181,6 @@ rm %{buildroot}%{_datadir}/PySide6/typesystems/*_{mac,win}.xml %fdupes -s %{buildroot}%{python_sitearch}/PySide6 -mkdir -p %{buildroot}%{_qt6_pluginsdir}/designer -mv %{buildroot}%{_prefix}/plugins/designer/libPySidePlugin.so %{buildroot}%{_qt6_pluginsdir}/designer - %endif # Install egg-info # qtpaths is needed