Hello community,
here is the log from the commit of package python3-pyside2 for openSUSE:Factory
checked in at 2019-07-11 13:18:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old)
and /work/SRC/openSUSE:Factory/.python3-pyside2.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside2"
Thu Jul 11 13:18:05 2019 rev:6 rq:714380 version:5.13.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes
2019-07-02 10:39:29.578681986 +0200
+++
/work/SRC/openSUSE:Factory/.python3-pyside2.new.4615/python3-pyside2.changes
2019-07-11 13:18:36.858763216 +0200
@@ -1,0 +2,7 @@
+Wed Jul 10 06:37:12 UTC 2019 - Tuukka Pasanen <tuukka.pasa...@ilmi.fi>
+
+- Add patches to make FreeCAD not crash at start
+ * 0002-Fix-qApp-import-of-QCoreApplication.patch
+ * 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch
+
+-------------------------------------------------------------------
New:
----
0002-Fix-qApp-import-of-QCoreApplication.patch
0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyside2.spec ++++++
--- /var/tmp/diff_new_pack.WGxjHv/_old 2019-07-11 13:18:37.422763039 +0200
+++ /var/tmp/diff_new_pack.WGxjHv/_new 2019-07-11 13:18:37.426763038 +0200
@@ -33,6 +33,8 @@
Patch0: lib64.patch
# PATCH-FIX-UPSTREAM - PYSIDE-881
Patch1: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch
+Patch2: 0002-Fix-qApp-import-of-QCoreApplication.patch
+Patch3: 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -119,6 +121,8 @@
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
export LLVM_INSTALL_DIR=%{_prefix}
++++++ 0002-Fix-qApp-import-of-QCoreApplication.patch ++++++
>From 5376a134f13124b9b228dd160f151a7c8eccd09a Mon Sep 17 00:00:00 2001
From: Christian Tismer <tis...@stackless.com>
Date: Thu, 27 Jun 2019 12:37:41 +0200
Subject: [PATCH 1/7] Fix qApp import of QCoreApplication
The qApp fix for embedding has a recursion bug when
QCoreApplication is imported.
This patch avoids imports altogether and uses the already
captured module, instead.
Change-Id: I1af7293a31840f6b09f8611446f6f35952dedd21
Reviewed-by: Milian Wolff <milian.wo...@kdab.com>
---
sources/shiboken2/libshiboken/qapp_macro.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sources/shiboken2/libshiboken/qapp_macro.cpp
b/sources/shiboken2/libshiboken/qapp_macro.cpp
index df24a805..12af9613 100644
--- a/sources/shiboken2/libshiboken/qapp_macro.cpp
+++ b/sources/shiboken2/libshiboken/qapp_macro.cpp
@@ -240,11 +240,13 @@ NotifyModuleForQApp(PyObject *module, void *qApp)
* Therefore, the implementation is very simple and just redirects the
* qApp_contents variable and assigns the instance, instead of vice-versa.
*/
- if (qApp != nullptr) {
- Shiboken::AutoDecRef pycore(PyImport_ImportModule("PySide2.QtCore"));
- Shiboken::AutoDecRef coreapp(PyObject_GetAttrString(pycore,
"QCoreApplication"));
- qApp_content = PyObject_CallMethod(coreapp, "instance", "");
- reset_qApp_var();
+ PyObject *coreDict = qApp_moduledicts[1];
+ if (qApp != nullptr && coreDict != nullptr) {
+ PyObject *coreApp = PyDict_GetItemString(coreDict, "QCoreApplication");
+ if (coreApp != nullptr) {
+ qApp_content = PyObject_CallMethod(coreApp, "instance", "");
+ reset_qApp_var();
+ }
}
}
--
2.22.0
++++++ 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch ++++++
>From 8fa674375a3ea5609ffe8dadeb697915347a4072 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <friedemann.kle...@qt.io>
Date: Thu, 4 Jul 2019 15:57:00 +0200
Subject: [PATCH 6/7] PySide2/QtCore: Remove duplicated type entry for "bool"
Another entry with converters exists a few lines below.
Change-Id: Id1de3835e42869a55e0bf865aa992f38748f2e88
Reviewed-by: Christian Tismer <tis...@stackless.com>
---
sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 4f800cc9..2173e747 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -171,7 +171,6 @@
<primitive-type name="quint16"/>
<primitive-type name="quint32"/>
<primitive-type name="quint64"/>
- <primitive-type name="bool"/>
<primitive-type name="double"/>
<primitive-type name="qreal"/>
<primitive-type name="float"/>
--
2.22.0
