Update to 21.08.1

2 files changed, 103 insertions, 7 deletions

diff --git a/27bfcde4.patch b/27bfcde4.patch
new file mode 100644
index 0000000..b41a7ad
--- /dev/null
+++ b/27bfcde4.patch
@@ -0,0 +1,97 @@
+From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <[email protected]>
+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/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
+
diff --git a/PKGBUILD b/PKGBUILD
index aefae05..a4f8a41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz <[email protected]>
 
 pkgname=dolphin
-pkgver=21.08.0
-pkgrel=2
+pkgver=21.08.1
+pkgrel=1
 pkgdesc='KDE File Manager'
 arch=(x86_64)
 url='https://apps.kde.org/dolphin/'
@@ -16,17 +16,16 @@ optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video
             'konsole: terminal panel' 'purpose: share context menu')
 groups=(kde-applications kde-system)
 source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
-        https://invent.kde.org/system/dolphin/-/commit/27bfcde4efaf936243fc41e4a61d0cac32105ef6.patch)
-sha256sums=('5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1'
+        27bfcde4.patch)
+sha256sums=('6e5dce2629f8333b426074d0f35dc96d40b528948db101443f8270ea554cb3ee'
             'SKIP'
-            'd0545f020236ebcec5d138dc963ab0fbcac74fd14f45de9559e6a06af8bd3ef4')
+            '9c17ce284b0623982b152fa76418ca3005e31c3977120f1f6bb5be351918e318')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <[email protected]>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <[email protected]>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]>
 
 prepare() {
-  sed -i 's/KF5_MIN_VERSION "5.81.0"/KF5_MIN_VERSION "5.82.0"/' $pkgname-$pkgver/CMakeLists.txt
-  patch -d $pkgname-$pkgver -p1 < 27bfcde4efaf936243fc41e4a61d0cac32105ef6.patch
+  patch -d $pkgname-$pkgver -p1 < 27bfcde4.patch # Fix opening terminal without kinit
 }
 
 build() {