Update to 21.12.0

2 files changed, 4 insertions, 107 deletions

diff --git a/27bfcde4.patch b/27bfcde4.patch
deleted file mode 100644
index b41a7ad..0000000
--- a/27bfcde4.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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 13f9a53..8e660bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz <[email protected]>
 
 pkgname=dolphin
-pkgver=21.08.3
+pkgver=21.12.0
 pkgrel=1
 pkgdesc='KDE File Manager'
 arch=(x86_64)
@@ -15,19 +15,13 @@ makedepends=(extra-cmake-modules kdoctools)
 optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video thumbnails' 'kdegraphics-thumbnailers: PDF and PS thumbnails'
             '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}
-        27bfcde4.patch)
-sha256sums=('3b17bfd81dcb04d37810cea0d52d098ce5244289a2eb0173f575291ca97bd9a7'
-            'SKIP'
-            '9c17ce284b0623982b152fa76418ca3005e31c3977120f1f6bb5be351918e318')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('e70fc08ee292c5f9bfd4fc3bb12eef524528bee8e856d294bf484b3eff7b2669'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <[email protected]>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <[email protected]>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]>
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < 27bfcde4.patch # Fix opening terminal without kinit
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF