summaryrefslogtreecommitdiffstats
path: root/source/l/PyQt5/patches/pyqt5-python2-crash.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-03-19 22:01:05 +0000
committer Eric Hameleers <alien@slackware.com>2020-03-20 08:59:33 +0100
commit30f51193f42e1a02f3ba9a16706bd037b9ffe93c (patch)
treef9a5d6061438db64c3c1afa47175016e51a55187 /source/l/PyQt5/patches/pyqt5-python2-crash.patch
parent9e2e1c45f763349b9e37c5786147a9edf97f9e2d (diff)
downloadcurrent-30f51193f42e1a02f3ba9a16706bd037b9ffe93c.tar.gz
current-30f51193f42e1a02f3ba9a16706bd037b9ffe93c.tar.xz
Thu Mar 19 22:01:05 UTC 202020200319220105
ap/ghostscript-9.52-x86_64-1.txz: Upgraded. l/PyQt5-5.13.2-x86_64-1.txz: Added. l/QScintilla-2.11.4-x86_64-3.txz: Rebuilt. Added PyQt5 support. Thanks to alienBOB. l/sip-4.19.21-x86_64-2.txz: Rebuilt. Recompiled to pick up Qt5 support. n/gpgme-1.13.1-x86_64-3.txz: Rebuilt. Added Qt5 bindings. Thanks to alienBOB.
Diffstat (limited to 'source/l/PyQt5/patches/pyqt5-python2-crash.patch')
-rw-r--r--source/l/PyQt5/patches/pyqt5-python2-crash.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/source/l/PyQt5/patches/pyqt5-python2-crash.patch b/source/l/PyQt5/patches/pyqt5-python2-crash.patch
new file mode 100644
index 000000000..14462f756
--- /dev/null
+++ b/source/l/PyQt5/patches/pyqt5-python2-crash.patch
@@ -0,0 +1,13 @@
+diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in
+--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200
++++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200
+@@ -151,8 +151,4 @@
+ // initialised first (at least for Windows) and this is the only way to
+ // guarantee things are done in the right order.
+ PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive);
+-
+- // Load the embedded qt.conf file if there is a bundled copy of Qt.
+- if (!qpycore_qt_conf())
+- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf");
+ }
+