rpm/python3-pyside2
SHA256
1
0
Fork 0
forked from pool/python3-pyside2
Code Pull Requests Activity

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

Browse Source 
- Add patch to support clang 10:
  * 0001-shiboken-Support-Clang-version-10.patch

OBS-URL: https://build.opensuse.org/request/show/796569
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=40
This commit is contained in:
Luca Beltrame 2020-04-25 07:25:04 +00:00 committed by Git OBS Bridge
parent b2490b772c
commit a5b01953f6
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-shiboken-Support-Clang-version-10.patch Normal file
View File

@ -0,0 +1,32 @@
From 9ae63824a5ec550e82561b9f07fc6307ae1f3cec Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 6 Apr 2020 08:15:11 +0200
Subject: [PATCH] shiboken: Support Clang version 10
Adapt the version check of the internal include directory to parse the
entire directory (typically named like 9.0.0) as version number
instead of just checking the first digit.
Change-Id: I7e09c36fd523328e962c7f2acbc8385787e94998
Fixes: PYSIDE-1259
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index d3e5e212..188725da 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -274,7 +274,7 @@ static QString findClangBuiltInIncludesDir()
for (const QFileInfo &fi : versionDirs) {
const QString fileName = fi.fileName();
if (fileName.at(0).isDigit()) {
- const QVersionNumber versionNumber = QVersionNumber::fromString(fileName.at(0));
+ const QVersionNumber versionNumber = QVersionNumber::fromString(fileName);
if (!versionNumber.isNull() && versionNumber > lastVersionNumber) {
candidate = fi.absoluteFilePath();
lastVersionNumber = versionNumber;
--
2.26.1

6
python3-pyside2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 23 12:46:58 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to support clang 10:
* 0001-shiboken-Support-Clang-version-10.patch
-------------------------------------------------------------------
Wed Feb 26 13:08:14 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

4
python3-pyside2.spec
View File

@ -33,11 +33,14 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.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
# PATCH-FIX-UPSTREAM
Patch0: lib64.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
# PATCH-FIX-OPENSUSE
Patch2: 0002-Fix-the-openSUSE-executable-names.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-shiboken-Support-Clang-version-10.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -122,6 +125,7 @@ Examples and Tutorials for the PySide2 bindings for Qt.
%setup -q -n pyside-setup-opensource-src-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if "%{_lib}" == "lib64"
%patch0 -p1
%endif