diff options
| author | Marius Bakke <[email protected]> | 2020-06-14 16:24:34 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-06-14 16:24:34 +0200 |
| commit | 4193095e18b602705df94e38a8d60ef1fe380e49 (patch) | |
| tree | 2500f31bcfae9b4cb5a23d633395f6892a7bd8a7 /gnu/packages/patches/pyqt-unbundled-qt.patch | |
| parent | a48a3f0640d76cb5e5945557c9aae6dabce39d93 (diff) | |
| parent | e88745a655b220b4047f7db5175c828ef9c33e11 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/pyqt-unbundled-qt.patch')
| -rw-r--r-- | gnu/packages/patches/pyqt-unbundled-qt.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/gnu/packages/patches/pyqt-unbundled-qt.patch b/gnu/packages/patches/pyqt-unbundled-qt.patch deleted file mode 100644 index 5c91ed031c..0000000000 --- a/gnu/packages/patches/pyqt-unbundled-qt.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove test for bundled Qt which breaks dependent applications. This has -been fixed in 5.13. - -Taken from Arch Linux: -https://git.archlinux.org/svntogit/packages.git/tree/trunk/python2-pyqt5-crash-fix.patch?h=packages/pyqt5&id=3e56e11d1fd7b1eac8242ce64c58db2bd9acba20 - -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"); - } - |