gentoo Easter resync : 12.04.2020

4 files changed, 40 insertions, 11 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index ffc1b2ee3e2a..9ecfc6cb25a3 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +1,6 @@
 AUX dolphin-19.12.2-create-new-consistency.patch 2399 BLAKE2B f4f11330e7a7f31085556df24f0cb71f644b8caf21e2871b5bbfa63a922cc0b7fd3268be4c60887cb281c03060e55450515f001790b5b5c6016a833f966e38a6 SHA512 d03e5ddbd428f7b4b1eae1496ae4bbad0985b16ab2f94b63ce09ad0fbf3cf03bd6ad12811b4f88639b29e5bce330d40bffeef0da9098d6b49f42c2974d51ad4d
-DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
-DIST dolphin-19.12.2.tar.xz 4778864 BLAKE2B d334e1d672a5856be0a13588f4238e0866eda11205b7284cb0e20b9f933b65168ab7a26c7aa716453bc2ef1d107c88a30feb595022abe93ea98a0ee98753dd9f SHA512 c9b43a3e923e6f261225ab7ebc0a35722f4aba197015e48739c7b0cc442dfa227875b55e85a28c8703abdfab7b592432d14ca3560155e59ad39a4542345646dc
-EBUILD dolphin-19.08.3.ebuild 2895 BLAKE2B 5330439a85c94fb18a97bb6066f03e9e58706fb69c423cd8afe68da49a935bd109f6835d0cb5c90658e125cf2019f86c3fdf3d610ac3b2f288ee544d28f9761b SHA512 6b454883f6ee0ea7b56f68a5fc76cdd90179f6982ebee89564d0cd2aa9e8336d3aac320459e69c52df361b2d1d232cdecc226147b2c85de12c52d321814f87f4
-EBUILD dolphin-19.12.2-r1.ebuild 2988 BLAKE2B 9ae1ddea9dc3ff22d588db271d3afe659cb32c68c8692945915e3286b9dd706a6a890d6b3e99c9bb350a1321785756f1e1466e63a0721ae05ed20f6e0a082721 SHA512 3f0893a8169b1604843c20524bb684657cd8a59f01b428c674a59e37397dd74c3316620b31a17686f9247f57db03a268f0d46c3e3d169a22a02aded5bf8bb913
+AUX dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch 633 BLAKE2B 7a03b7b88ff39adcd342032c3a0d2544d09f844417e1c859fc4deeaef04759f4187e79013d35722ba46f59c61370e07c217839a97a6ebfa1a5e07dffbb8fafc3 SHA512 82a2fdc3d6cbfd2282daeada07358366d02f325c69fa3ff3c75da19fa6d255932ee419bf7ad2c044e09091dc9a72aabcc0fa74fb12d0b9b0d5831df7b6bd5214
+DIST dolphin-19.12.3.tar.xz 4781456 BLAKE2B 310d0ea5e25b5d934bd501ac0c9bed15a4545b6b16299ad138715b6a33f20edd91675af679bb4249fd523fbf5ffe57c12cc1d7691a167e1783648698a533d584 SHA512 d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5
+EBUILD dolphin-19.12.3-r1.ebuild 3063 BLAKE2B fc45b967bd25b08805272cc109fefb59f02db48fa56ddb86a988fc19c5a29217dc036a954425e7771dd3e0830a168dd357e900ad8db4adda4d2c13a3a9a1c7c3 SHA512 ab8fa18d1d38ac4c4a30ae69f0158760ffcd0720143283a3cf826dbeedfcd7323d39c2f73becd88c6ef75ab2f29c28bca66475cf381e079fc8a96ee83a909158
+EBUILD dolphin-19.12.3.ebuild 2994 BLAKE2B f25604ba188b68f2d1130a05c9b03ef020a27d7050d9922d1ca7b689c465ed3a431b06f255519cd5ac5ac5b097f2704fab425dec5f69dc8d938d4e35a61ddc88 SHA512 409e42d35d0a2af090cb36daafa66a538c7edf94914cccc55883f161f9d7593fda7b5fe3f7913190379c8ac8c3f264b5364a9a71da3757d7930364e5d37eef41
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild
index 8a4b107a6fa6..4f5ca6b530cc 100644
--- a/kde-apps/dolphin/dolphin-19.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
+KFMIN=5.63.0
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
+https://userbase.kde.org/Dolphin"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
@@ -62,6 +64,11 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" # from 20.04
+	"${FILESDIR}/${P}-fix-crash-w-qt-5.14.2.patch" # KDE-Bug 419585
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
diff --git a/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild b/kde-apps/dolphin/dolphin-19.12.3.ebuild
index 5d2d40673864..63563dbe6215 100644
--- a/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.3.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-create-new-consistency.patch" ) # from 20.04
+PATCHES=( "${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" ) # from 20.04
 
 src_configure() {
 	local mycmakeargs=(
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 000000000000..3e5245001bb3
--- /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);
+     }