gentoo resync : 03.09.2021

3 files changed, 118 insertions, 3 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 81edbc54afb2..53f5113810d5 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-21.08.1-port-to-KTerminalLauncherJob.patch 3579 BLAKE2B efcff49c7089d419f8c62b93fe0a5ef6459055a1a761b34c0bb40c20bf3c5a17daa1c1e77974158733573f479125f0c53985ba38547d07090f15f65907fa41c2 SHA512 35b21983204583aef7dd980faecb8c33eb88f50841f8b9996c3f2784393cc1d9cff85e57581cd3c380bd62dc51802979be9882c4d4d1102799a0038f734176f9
 DIST dolphin-21.04.3.tar.xz 5228312 BLAKE2B cdfbde0789b5c2dfc31d61e8c37b47e82a31877da9437770c463149b33ee46d4b5b1866aa38b1991f12e878ea27f4424c6b162113d87a865e0bcd815941abd4e SHA512 bb7d2f342aecae3b424aef93591124a5ca041e5e75909ed43c6202bc7cf7ab0e34a883050194b6e71f71425b2116ee579e67016205a648de6d5e5b0d01bf3ea8
-DIST dolphin-21.08.0.tar.xz 5298512 BLAKE2B 54962d2c200a79948553eb850f3cedfbe957f690a27cf04d613bc476ccdc41b74edefbce71aceab48c8efe6c50787d0e9d834a4042092b12a8bf4cc3fa6cda40 SHA512 a1bb96ebefbe29d018a2f91c708c62e38014dbf7725b6f4e95d5a83e486fbe2419d96a7bcc33bd592a3602f57a142350c372728948ebcc17a5bbe093f30b0154
+DIST dolphin-21.08.1.tar.xz 5301820 BLAKE2B f42c1e1dee3ed3da3e54920532a82419b038a8469bf7b9c1d833e2c81e1ffa4fac3489594dad2d4cd9743170d4f425df13f68e8147128770e7d09066139acde6 SHA512 36f4e8b7d441cbb190eb36cf659dfe1f4cdd909bca15c82fa629d0d55489f62d5b8e01bd667b89852c6d8998ba989b29ff586e441ec68c425ebb1863c894a88f
 EBUILD dolphin-21.04.3.ebuild 3135 BLAKE2B 0e8fdf0027fc4ab4e65b69c6dd5d8a244e4e6c1e296d98a68fe66bdb2fd089de3d8e6342321284c00ba7955ba325f6e799befe15b8dc95e0444e22a09160ccc6 SHA512 3503db26e163eb777b07dd44df6fd4e249edcbdcf006b41ad21e387a46e4d858af57adba4cd70ed9ae7d524ea780a444a0546a6f8a3fcedb4df4bee0d697fcdf
-EBUILD dolphin-21.08.0.ebuild 3098 BLAKE2B a1cb74b6b749cdb3cd3b7f72a2c29e92ac8b320ef001b59e753ccc5bd50b7683befc64fdb052c1b2925a504d21cd7fbfdbf1d0e964026e010629efdcede88bf9 SHA512 952172e1e8993838458b6b485acf3df181eef3abc9760bb3db3f303126b34b96ac2cde7f07a05ffaebfcf87505f978d215a7d18170a86a3353e85e5e06d8125f
+EBUILD dolphin-21.08.1.ebuild 3192 BLAKE2B a4c14d75a5e923215f653a1d004c88ad92e8d2a5b8103f349e2ce2d4ec5f6fa0949b5066bb50ca75c5a2b21cb48be7ab74427619d34b73e0af34899d1f2372cb SHA512 2fc4cf9df2916fa5f571687d77a8e39d98d30394b4d8035d772cc5b94e0e56962882879fd61dbfededeee39eb7584193938fde3aefd3d52772c55ba91954f8ea
 MISC metadata.xml 429 BLAKE2B 6ff7efa4e3bbc16f5fb34caeea9cfe5946093b593e48631d4c651bd0225118dee6cb0122f6003ec4b07bdcf77a3beba96cb997c6262cad848d005e8ab8f2a25b SHA512 7c47552ca9cc096bf58fbec1c075f486288a92cb4bac4f8db8ec7ccfaec65a07159927bc04c76c8b9ffc73b4cddad67128300fc02abeda4954a673a219f61ad1
diff --git a/kde-apps/dolphin/dolphin-21.08.0.ebuild b/kde-apps/dolphin/dolphin-21.08.1.ebuild
index 57cfe86f07b8..5f0b15fd29da 100644
--- a/kde-apps/dolphin/dolphin-21.08.0.ebuild
+++ b/kde-apps/dolphin/dolphin-21.08.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
@@ -61,6 +61,10 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-21.08.1-port-to-KTerminalLauncherJob.patch" # KDE-bug 441072
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch b/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch
new file mode 100644
index 000000000000..2189355de6a5
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch
@@ -0,0 +1,110 @@
+From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 31 Aug 2021 09:09:14 -0600
+Subject: [PATCH] Port to KTerminalLauncherJob
+
+Dolphin still uses KToolInvocation::invokeTerminal() which is
+deprecated and requires KInit. However Dolphin was ported away from
+requiring it in other ways, so it is now possible to have Dolphin
+running but not KInit, which breaks the "Open in Terminal"
+functionality.
+
+Using KTerminalLauncherJob fixes this. It was introduced in Frameworks
+5.83, so the CMake dependency version is accordingly increased.
+
+BUG: 441072
+FIXED-IN: 21.12
+---
+ CMakeLists.txt            |  2 +-
+ src/dolphinmainwindow.cpp | 14 ++++++++++----
+ src/dolphinpart.cpp       |  6 ++++--
+ 3 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d50205bc..ec87cdecc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
+ project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
+ 
+ set(QT_MIN_VERSION "5.15.0")
+-set(KF5_MIN_VERSION "5.81.0")
++set(KF5_MIN_VERSION "5.83.0")
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
+index 62e347032..f3a5e3b4e 100644
+--- a/src/dolphinmainwindow.cpp
++++ b/src/dolphinmainwindow.cpp
+@@ -56,10 +56,10 @@
+ #include <KStandardAction>
+ #include <KStartupInfo>
+ #include <KSycoca>
++#include <KTerminalLauncherJob>
+ #include <KToggleAction>
+ #include <KToolBar>
+ #include <KToolBarPopupAction>
+-#include <KToolInvocation>
+ #include <KUrlComboBox>
+ #include <KUrlNavigator>
+ #include <KWindowSystem>
+@@ -1033,7 +1033,9 @@ void DolphinMainWindow::openTerminal()
+     const QUrl url = m_activeViewContainer->url();
+ 
+     if (url.isLocalFile()) {
+-        KToolInvocation::invokeTerminal(QString(), {}, url.toLocalFile());
++        auto job = new KTerminalLauncherJob(QString());
++        job->setWorkingDirectory(url.toLocalFile());
++        job->start();
+         return;
+     }
+ 
+@@ -1047,14 +1049,18 @@ void DolphinMainWindow::openTerminal()
+                 statUrl = job->mostLocalUrl();
+             }
+ 
+-            KToolInvocation::invokeTerminal(QString(), {}, statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
++            auto job = new KTerminalLauncherJob(QString());
++            job->setWorkingDirectory(statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
++            job->start();
+         });
+ 
+         return;
+     }
+ 
+     // Nothing worked, just use $HOME
+-    KToolInvocation::invokeTerminal(QString(), {}, QDir::homePath());
++    auto job = new KTerminalLauncherJob(QString());
++    job->setWorkingDirectory(QDir::homePath());
++    job->start();
+ }
+ 
+ void DolphinMainWindow::editSettings()
+diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
+index 9c551d67a..8d528f418 100644
+--- a/src/dolphinpart.cpp
++++ b/src/dolphinpart.cpp
+@@ -32,7 +32,7 @@
+ #include <KPluginFactory>
+ #include <KIO/CommandLauncherJob>
+ #include <KSharedConfig>
+-#include <KToolInvocation>
++#include <KTerminalLauncherJob>
+ 
+ #include <QActionGroup>
+ #include <QApplication>
+@@ -567,7 +567,9 @@ QString DolphinPart::localFilePathOrHome() const
+ 
+ void DolphinPart::slotOpenTerminal()
+ {
+-    KToolInvocation::invokeTerminal(QString(), {}, localFilePathOrHome());
++    auto job = new KTerminalLauncherJob(QString());
++    job->setWorkingDirectory(localFilePathOrHome());
++    job->start();
+ }
+ 
+ void DolphinPart::slotFindFile()
+-- 
+GitLab
+