This commit is contained in:
parent
bfc6e0e242
commit
af2b48d993
33
fix_build.patch
Normal file
33
fix_build.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 70d241713ae375124eaabdd928fcdfd034822c6e Mon Sep 17 00:00:00 2001
|
||||
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
||||
Date: Wed, 29 Aug 2018 16:09:01 +0200
|
||||
Subject: shiboken/pep384: Avoid warning by literal comparison
|
||||
|
||||
Even though we are certain of the comparison,
|
||||
better to get rid of the warnings.
|
||||
|
||||
Change-Id: Iafa51b4c59c2315b24fc9092d18792f0c9297553
|
||||
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
||||
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
||||
---
|
||||
sources/shiboken2/libshiboken/pep384impl.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
(limited to 'sources/shiboken2/libshiboken/pep384impl.cpp')
|
||||
|
||||
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
|
||||
index 25a3b625..4481f1cd 100644
|
||||
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
|
||||
+++ b/sources/shiboken2/libshiboken/pep384impl.cpp
|
||||
@@ -130,7 +130,7 @@ check_PyTypeObject_valid(void)
|
||||
long probe_tp_dictoffset = PyLong_AsLong(d);
|
||||
PyObject *probe_tp_mro = PyObject_GetAttrString(obtype, "__mro__");
|
||||
if (false
|
||||
- || probe_tp_name != check->tp_name
|
||||
+ || (probe_tp_name - check->tp_name) != 0 // to avoid warning
|
||||
|| probe_tp_basicsize != check->tp_basicsize
|
||||
|| probe_tp_call != check->tp_call
|
||||
|| probe_tp_str != check->tp_str
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 23 20:29:53 UTC 2018 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add fix_build.patch to fix an error reported by the post build checks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 22 14:40:28 UTC 2018 - Adrian Schröter <adrian@suse.de>
|
||||
|
||||
|
@ -32,6 +32,8 @@ Url: http://wiki.qt.io/Qt_for_Python
|
||||
Source0: pyside-setup-%{version}.tar.xz
|
||||
Patch1: fix-cmake.patch
|
||||
Patch2: lib64.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch3: fix_build.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -109,6 +111,7 @@ for Qt.
|
||||
%if "%{_lib}" == "lib64"
|
||||
%patch2 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export LLVM_INSTALL_DIR=/usr
|
||||
|
Loading…
Reference in New Issue
Block a user