From da30ad737ca2a0db6e0e4bae399a89a5753f51bcd646d451d1019d602c96401c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 20 Apr 2023 09:20:08 +0000 Subject: [PATCH] Accepting request 1080333 from home:krop:branches:KDE:Qt5 Update to 5.15.9 OBS-URL: https://build.opensuse.org/request/show/1080333 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=70 --- 0001-Fix-build-with-Python-3.10.patch | 28 --------------------- pyside-setup-opensource-src-5.15.8.tar.xz | 3 --- pyside-setup-opensource-src-5.15.9-1.tar.xz | 3 +++ python3-pyside2.changes | 9 +++++++ python3-pyside2.spec | 16 ++++-------- 5 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 0001-Fix-build-with-Python-3.10.patch delete mode 100644 pyside-setup-opensource-src-5.15.8.tar.xz create mode 100644 pyside-setup-opensource-src-5.15.9-1.tar.xz diff --git a/0001-Fix-build-with-Python-3.10.patch b/0001-Fix-build-with-Python-3.10.patch deleted file mode 100644 index 7297eb3..0000000 --- a/0001-Fix-build-with-Python-3.10.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9cc26aab3244b3022bcb5be338602f2e02e0b3d6 Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Fri, 13 Jan 2023 10:41:28 +0100 -Subject: [PATCH] Fix build with Python 3.10 - -Patch picked from ArchLinux - -Also see https://bugreports.qt.io/browse/PYSIDE-1775 ---- - sources/shiboken2/libshiboken/pep384impl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp -index 66df0fd..a723303 100644 ---- a/sources/shiboken2/libshiboken/pep384impl.cpp -+++ b/sources/shiboken2/libshiboken/pep384impl.cpp -@@ -751,7 +751,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name) - #endif // IS_PY2 - Shiboken::AutoDecRef privateobj(PyObject_GetAttr( - reinterpret_cast(Py_TYPE(self)), Shiboken::PyMagicName::name())); --#ifndef Py_LIMITED_API -+#if !defined(Py_LIMITED_API) && PY_VERSION_HEX < 0x03010000 - return _Py_Mangle(privateobj, name); - #else - // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always. --- -2.39.0 - diff --git a/pyside-setup-opensource-src-5.15.8.tar.xz b/pyside-setup-opensource-src-5.15.8.tar.xz deleted file mode 100644 index 620149b..0000000 --- a/pyside-setup-opensource-src-5.15.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d -size 3582256 diff --git a/pyside-setup-opensource-src-5.15.9-1.tar.xz b/pyside-setup-opensource-src-5.15.9-1.tar.xz new file mode 100644 index 0000000..30be2d9 --- /dev/null +++ b/pyside-setup-opensource-src-5.15.9-1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3298660742037c71274a30770541abf6d1552ec65fc93678eedee5718852a62c +size 3582760 diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 4f23012..71cd4a4 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 19 11:02:38 UTC 2023 - Christophe Marin + +- Update to 5.15.9 + * QByteArray::__msetitem__() was fixed for big endian archs + * UNICODE conversion with Python3/Non-Limited API was fixed +- Drop patch, fixed upstream: + * 0001-Fix-build-with-Python-3.10.patch + ------------------------------------------------------------------- Thu Apr 13 10:01:16 UTC 2023 - Christophe Marin diff --git a/python3-pyside2.spec b/python3-pyside2.spec index e959f17..f8a201d 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -22,7 +22,7 @@ %global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin) Name: python3-pyside2 -Version: 5.15.8 +Version: 5.15.9 Release: 0 Summary: Python bindings for Qt # Legal: @@ -30,9 +30,8 @@ Summary: Python bindings for Qt # pyside2-tools is GPL-2.0-only # shiboken2 contains files under 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 -Group: Development/Languages/Python -URL: http://wiki.qt.io/Qt_for_Python -Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz +URL: https://wiki.qt.io/Qt_for_Python +Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.9-src/pyside-setup-opensource-src-5.15.9-1.tar.xz # PATCH-FIX-OPENSUSE Patch0: 0001-Always-link-to-python-libraries.patch # PATCH-FIX-UPSTREAM @@ -41,8 +40,6 @@ Patch1: 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch Patch2: 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch # PATCH-FIX-UPSTREAM Patch3: 0001-Backport-Fix-GLES-builds.patch -# PATCH-FIX-UPSTREAM PYSIDE-1775 -Patch4: 0001-Fix-build-with-Python-3.10.patch # Provide the PyPI names Provides: python3-PySide2 = %{version}-%{release} Provides: python3-shiboken2 = %{version}-%{release} @@ -126,7 +123,6 @@ application and UI framework. %package devel Summary: Header Files for PySide2 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 -Group: Development/Languages/Python Requires: %{name} = %{version} %description devel @@ -136,7 +132,6 @@ for Qt. %package examples Summary: Examples for using PySide2 License: BSD-3-Clause -Group: Development/Languages/Python Requires: %{name} = %{version} BuildArch: noarch @@ -144,7 +139,7 @@ BuildArch: noarch Examples and Tutorials for the PySide2 bindings for Qt. %prep -%autosetup -p1 -n pyside-setup-opensource-src-%{version} +%autosetup -p1 -n pyside-setup-opensource-src-5.15.9 %build _libsuffix=$(echo %{_lib} | cut -b4-) @@ -246,8 +241,7 @@ pushd build/sources/pyside2 popd %endif -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.*