[arch-commits] Commit in dolphin/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Oct 7 09:32:46 UTC 2021
Date: Thursday, October 7, 2021 @ 09:32:45
Author: arojas
Revision: 425258
archrelease: copy trunk to extra-x86_64
Added:
dolphin/repos/extra-x86_64/27bfcde4.patch
(from rev 425257, dolphin/trunk/27bfcde4.patch)
dolphin/repos/extra-x86_64/PKGBUILD
(from rev 425257, dolphin/trunk/PKGBUILD)
Deleted:
dolphin/repos/extra-x86_64/27bfcde4.patch
dolphin/repos/extra-x86_64/PKGBUILD
----------------+
27bfcde4.patch | 194 +++++++++++++++++++++++++++----------------------------
PKGBUILD | 78 +++++++++++-----------
2 files changed, 136 insertions(+), 136 deletions(-)
Deleted: 27bfcde4.patch
===================================================================
--- 27bfcde4.patch 2021-10-07 09:32:36 UTC (rev 425257)
+++ 27bfcde4.patch 2021-10-07 09:32:45 UTC (rev 425258)
@@ -1,97 +0,0 @@
-From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate at 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/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
-
Copied: dolphin/repos/extra-x86_64/27bfcde4.patch (from rev 425257, dolphin/trunk/27bfcde4.patch)
===================================================================
--- 27bfcde4.patch (rev 0)
+++ 27bfcde4.patch 2021-10-07 09:32:45 UTC (rev 425258)
@@ -0,0 +1,97 @@
+From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate at 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/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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-07 09:32:36 UTC (rev 425257)
+++ PKGBUILD 2021-10-07 09:32:45 UTC (rev 425258)
@@ -1,39 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux,org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=dolphin
-pkgver=21.08.1
-pkgrel=1
-pkgdesc='KDE File Manager'
-arch=(x86_64)
-url='https://apps.kde.org/dolphin/'
-license=(LGPL)
-depends=(baloo-widgets knewstuff kio-extras kcmutils kparts kactivities kuserfeedback)
-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=('6e5dce2629f8333b426074d0f35dc96d40b528948db101443f8270ea554cb3ee'
- 'SKIP'
- '9c17ce284b0623982b152fa76418ca3005e31c3977120f1f6bb5be351918e318')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
- D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < 27bfcde4.patch # Fix opening terminal without kinit
-}
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DBUILD_TESTING=OFF
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: dolphin/repos/extra-x86_64/PKGBUILD (from rev 425257, dolphin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-07 09:32:45 UTC (rev 425258)
@@ -0,0 +1,39 @@
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=dolphin
+pkgver=21.08.2
+pkgrel=1
+pkgdesc='KDE File Manager'
+arch=(x86_64)
+url='https://apps.kde.org/dolphin/'
+license=(LGPL)
+depends=(baloo-widgets knewstuff kio-extras kcmutils kparts kactivities kuserfeedback)
+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=('4256d5077cc83f8025838b59f4dafabb16ed800bcb58761f312f6a8cdcc551a1'
+ 'SKIP'
+ '9c17ce284b0623982b152fa76418ca3005e31c3977120f1f6bb5be351918e318')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
+ D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < 27bfcde4.patch # Fix opening terminal without kinit
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
More information about the arch-commits
mailing list