gentoo resync : 28.04.2021

4 files changed, 86 insertions, 11 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index f3b611a8b395..b51fccf7bc04 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
-DIST dolphin-20.08.3.tar.xz 5094964 BLAKE2B 368eca6e1972361bdb02bb3b1d3b449074d7d48af7bb88df60447ac9a7c88e8562fcac185c96596c57520df3efb87859cd21ad19e3b8515ec4ce40ebc7d2b3a5 SHA512 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c
+AUX dolphin-20.12.3-fix-session-restore-w-o-tabs.patch 2643 BLAKE2B 07856c16e9e68739a8b9feec46e1fe16272eddf49b45a88c7030d2439cb90345dc902ea5d11e08f0565c0a45fde3c2efe912d8225547e679dd7ae5d0e3b38e18 SHA512 182fd1e6e87a7a25326123be17015174e84124b042056ea72353c7f051de7ecc550b8284885ce3cb92b2a9e88b81cd6e40426369acdeb33995c9fdc3534c9efc
 DIST dolphin-20.12.3.tar.xz 5134660 BLAKE2B 3ad3e7c16d0c4203e189bdf035028777115971091bc3c45a3e88231f9715c9439f44c67b2bf2d9d4680a07d222c0c14858028d54499fbe8cf006e3eae63a9193 SHA512 fb57121875fb6b3db9b3071590ea2b6fe7db1d22238af758591835946ac297d7a1734646385a2f6b7ade41de7dcfdf8f6b5e7dccf335a3cf558259d017e44a11
-EBUILD dolphin-20.08.3.ebuild 3065 BLAKE2B d935f22318e5aa0dfdc22ba1f6dc9b6c9a79bd8e19509c75e918c7ee6855e8fabc55351d5e8bb0e01f349d305c448cafbee77fb6aaceef4e7afdd1c25892af39 SHA512 e78165d126936b7b1e324e3cbdc57f6af5632d27f3c9ed6be3a742d60a71c1edcf2949c78fa4ecf50c8661b841ac8a80fc80bd754e1c1a8d35cdb4b2e3afd3c3
-EBUILD dolphin-20.12.3.ebuild 3172 BLAKE2B 47dfb6d42fe679f6e685e3c2fb704d564c08eace47e39f1f6d76295cbe4c22766843b9e8168d15480db1d0bf4cd6bbe641c42ee64c166e4aa8e5411d896bca92 SHA512 1b28db9562633f701f485ff7956d6bf614439443b2f4887bfdd9a31e1abfbdec9f736c3b557ea5643b732546d196c6144cb33005b54493c256b798db3eef0a40
+DIST dolphin-21.04.0.tar.xz 5160064 BLAKE2B 4443e68ca72e3849a082644c4f14e1bab57581261be3da20bd1a2f646277270d617d78afab1f0c26244886de77a1d3aa701cdda66dce33f69e3e84c389353dd2 SHA512 6675d39146f69395c51d264459b6ba29210d131fed068de8006be1ba324c604ce004ccc4e5d68cc8ac6c0dfa5a63a7b2fac25c04227e6abc802dfe5a37e96c35
+EBUILD dolphin-20.12.3-r1.ebuild 3222 BLAKE2B dab5e90ca245bca9593ff081935c03baa4e2cc151033d19b859f698285b8dae34a3fce1efb4ac53c6ddf53cec7e9f2a403b9adc095853d12677e513a97ff7b92 SHA512 4b4060d40cb8e18a0e457e4b1acc4675e4b38404265db96fc7fdd45d41e176668abbbb8ed320024f667faf7c499ac7f181b551ffd23e4729fc043f591665518e
+EBUILD dolphin-21.04.0.ebuild 3140 BLAKE2B bc0910dceeedc0acd0e0df61c4fd9c0df3133b46a76df5808f649d1aea76c904aabe7cb0e77e902028a5100948a7e0581c53f73383f40f1d0a817d9759dfbbb3 SHA512 a6fe7b44df2ee1293bc2cc3e315f9869e2516e6d12cc07d87e241b8f7fae84657fb52eb1618ed2c85fc8897f589d9cf2d21430beb21bbe3639d4ee87a8a34a00
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.08.3.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
index 05f04613e4bd..7f9f2d90c9af 100644
--- a/kde-apps/dolphin/dolphin-20.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="activities semantic-desktop"
+IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -37,7 +37,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5=
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -56,11 +56,16 @@ DEPEND="
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
@@ -68,6 +73,7 @@ src_configure() {
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 	ecm_src_configure
 }
@@ -84,7 +90,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
 		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
 		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
diff --git a/kde-apps/dolphin/dolphin-20.12.3.ebuild b/kde-apps/dolphin/dolphin-21.04.0.ebuild
index a352ed21adbf..2f5121e83267 100644
--- a/kde-apps/dolphin/dolphin-20.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -86,7 +86,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
 		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
 		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
diff --git a/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
new file mode 100644
index 000000000000..9605bead03cf
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
@@ -0,0 +1,70 @@
+From 175538020824355115cd98637ce83ecc53badd44 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 18 Mar 2021 13:42:59 -0600
+Subject: [PATCH] Don't re-open already-open URLs when using session-restore
+ feature
+
+If Dolphin would be asked to open a location that is already open, don't
+open it again in a new tab; instead switch to that view. Supports tabs
+and split view.
+
+BUG: 434911
+FIXED-IN: 21.04
+---
+ src/dolphintabwidget.cpp | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
+index d61a9f74f..17fa0ff4e 100644
+--- a/src/dolphintabwidget.cpp
++++ b/src/dolphintabwidget.cpp
+@@ -186,14 +186,20 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+ {
+     Q_ASSERT(dirs.size() > 0);
+ 
++    bool somethingWasAlreadyOpen = false;
++
+     QList<QUrl>::const_iterator it = dirs.constBegin();
+     while (it != dirs.constEnd()) {
+         const QUrl& primaryUrl = *(it++);
+         const QPair<int, bool> indexInfo = indexByUrl(primaryUrl);
+         const int index = indexInfo.first;
+         const bool isInPrimaryView = indexInfo.second;
++
++        // When the user asks for a URL that's already open, activate it instead
++        // of opening a second copy
+         if (index >= 0) {
+-            setCurrentIndex(index);
++            somethingWasAlreadyOpen = true;
++            activateTab(index);
+             const auto tabPage = tabPageAt(index);
+             if (isInPrimaryView) {
+                 tabPage->primaryViewContainer()->setActive(true);
+@@ -204,13 +210,19 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+             // Required for updateViewState() call in openFiles() to work as expected
+             // If there is a selection, updateViewState() calls are effectively a no-op
+             tabPage->activeViewContainer()->view()->clearSelection();
+-            continue;
+-        }
+-        if (splitView && (it != dirs.constEnd())) {
++        } else if (splitView) {
+             const QUrl& secondaryUrl = *(it++);
+-            openNewActivatedTab(primaryUrl, secondaryUrl);
++            if (somethingWasAlreadyOpen) {
++                openNewTab(primaryUrl, secondaryUrl);
++            } else {
++                openNewActivatedTab(primaryUrl, secondaryUrl);
++            }
+         } else {
+-            openNewActivatedTab(primaryUrl);
++            if (somethingWasAlreadyOpen) {
++                openNewTab(primaryUrl);
++            } else {
++                openNewActivatedTab(primaryUrl);
++            }
+         }
+     }
+ }
+-- 
+GitLab
+