pool/python3-pyside2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 924880 from home:cgiboudeaux:branches:KDE:Qt5

Browse Source 
Backport change from pyside6. Not built yet.

OBS-URL: https://build.opensuse.org/request/show/924880
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=54
This commit is contained in:
Christophe Giboudeaux 2021-10-12 15:20:09 +00:00 committed by Git OBS Bridge
parent 37fde23b46
commit b3581a24c4
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Backport-LLVM-13-fix-from-shiboken6.patch Normal file
View File

@ -0,0 +1,40 @@
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

6
python3-pyside2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 12 13:52:59 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Backport change from pyside6:
* 0001-Backport-LLVM-13-fix-from-shiboken6.patch
-------------------------------------------------------------------
Sun Jun 27 17:11:23 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

3
python3-pyside2.spec
View File

@ -44,6 +44,8 @@ Patch1: 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
Patch2: 0002-Fix-the-openSUSE-executable-names.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
# PATCH-FIX-UPSTREAM
Patch4: 0001-Backport-LLVM-13-fix-from-shiboken6.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -132,6 +134,7 @@ Examples and Tutorials for the PySide2 bindings for Qt.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%if "%{_lib}" == "lib64"
%patch0 -p1
%endif