summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-08 00:30:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-09 23:36:26 +0200
commit99ec5f37f59f0c3d5077988b765d2b93896c6c73 (patch)
treeb5c0dd3f4b44db03d595217ed6804e44e6db20de /kde-apps/dolphin/files
parentkde-misc/rsibreak: Drop 0.12.12 (diff)
downloadgentoo-99ec5f37f59f0c3d5077988b765d2b93896c6c73.tar.gz
gentoo-99ec5f37f59f0c3d5077988b765d2b93896c6c73.tar.bz2
gentoo-99ec5f37f59f0c3d5077988b765d2b93896c6c73.zip
kde-apps/dolphin: Fix crashes with Qt 5.14.2
Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/dolphin/files')
-rw-r--r--kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
new file mode 100644
index 00000000000..3e5245001bb
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
@@ -0,0 +1,22 @@
+diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
+--- a/src/kitemviews/kfileitemmodel.cpp
++++ b/src/kitemviews/kfileitemmodel.cpp
+@@ -33,6 +33,9 @@
+ #include <QMimeData>
+ #include <QTimer>
+ #include <QWidget>
++#include <QMutex>
++
++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive))
+
+ // #define KFILEITEMMODEL_DEBUG
+
+@@ -1878,6 +1881,8 @@
+
+ int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const
+ {
++ QMutexLocker collatorLock(s_collatorMutex());
++
+ if (m_naturalSorting) {
+ return collator.compare(a, b);
+ }