Accepting request 1058282 from KDE:Qt5

OBS-URL: https://build.opensuse.org/request/show/1058282
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside2?expand=0&rev=20

0001-Backport-LLVM-13-fix-from-shiboken6.patch

@@ -1,40 +0,0 @@
-From b9bd01e741fd71d8efd917159fab1815ec3a14de Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 12 Oct 2021 15:51:36 +0200
-Subject: [PATCH] Backport LLVM 13 fix from shiboken6
-
-From a4a5fa4568473dd63bf04c9bfd115d3cbe3c504e Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Tue, 12 Oct 2021 09:33:53 +0200
-Subject: [PATCH] shiboken6: Adapt to LLVM 12.01
-
-The identifier for anonymous enums has been changed, causing
-shiboken to no longer recognize them.
-
-Pick-to: 6.2 5.15
-Task-number: PYSIDE-1686
-
-Change-Id: I1dadc39d6b838bf36009cb8e02ef5e0667e6339e
----
- sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-index 73b1aca63..9cd1c6bc1 100644
---- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-@@ -887,8 +887,10 @@ static QString enumType(const CXCursor &cursor)
-         // PYSIDE-1228: For "typedef enum { v1, v2 } Foo;", type will return
-         // "Foo" as expected. Care must be taken to exclude real anonymous enums.
-         name = getTypeName(clang_getCursorType(cursor));
--        if (name.contains(QLatin1String("(anonymous")))
-+        if (name.contains(u"(unnamed") // Clang 12.0.1
-+            || name.contains(u"(anonymous")) { // earlier
-             name.clear();
-+	}
-     }
-     return name;
- }
--- 
-2.33.0
-

0001-Fix-build-with-Python-3.10.patch

@@ -0,0 +1,28 @@
+From 9cc26aab3244b3022bcb5be338602f2e02e0b3d6 Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+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<PyObject *>(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
+

pyside-setup-opensource-src-5.15.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33
-size 3577972

pyside-setup-opensource-src-5.15.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d
+size 3582256

python3-pyside2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan 11 11:18:52 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 5.15.8.
+  * Check the changes-5.15.8 file for the full list of changes
+- Drop patch, merged upstream:
+  * 0001-Backport-LLVM-13-fix-from-shiboken6.patch
+- Add patch to fix build with recent Python versions:
+  * 0001-Fix-build-with-Python-3.10.patch
+
 -------------------------------------------------------------------
 Tue Aug  9 08:25:41 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

python3-pyside2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python3-pyside2
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin)
 
 Name:           python3-pyside2
-Version:        5.15.5
+Version:        5.15.8
 Release:        0
 Summary:        Python bindings for Qt
 # Legal:
@@ -40,9 +40,9 @@ Patch1:         0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
 # PATCH-FIX-UPSTREAM
 Patch2:         0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
 # PATCH-FIX-UPSTREAM
-Patch3:         0001-Backport-LLVM-13-fix-from-shiboken6.patch
+Patch3:         0001-Backport-Fix-GLES-builds.patch
-# PATCH-FIX-UPSTREAM
+# PATCH-FIX-UPSTREAM PYSIDE-1775
-Patch4:         0001-Backport-Fix-GLES-builds.patch
+Patch4:         0001-Fix-build-with-Python-3.10.patch
 # Provide the PyPI names
 Provides:       python3-PySide2 = %{version}-%{release}
 Provides:       python3-shiboken2 = %{version}-%{release}