Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2021-09-04 22:32:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin" Sat Sep 4 22:32:52 2021 rev:86 rq:915835 version:21.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2021-08-16 10:06:21.987469749 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin.new.1899/dolphin.changes 2021-09-04 22:34:15.760064624 +0200 @@ -1,0 +2,20 @@ +Thu Sep 2 10:27:40 UTC 2021 - Antonio Larrosa <[email protected]> + +- Add patch to fix the "Open in Terminal" functionality if kinit + is not running (kde#441072): + * 0001-Port-to-KTerminalLauncherJob.patch + +------------------------------------------------------------------- +Wed Sep 1 12:37:43 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.1 +- Changes since 21.08.0: + * Filter the items that have changed + * FoldersPanel: Fix inline renaming (kde#441124) + * Fix selecting file always opening new instance (kde#440663) + * Avoid crash on start when help actions are restricted through the Kiosk system + +------------------------------------------------------------------- Old: ---- dolphin-21.08.0.tar.xz dolphin-21.08.0.tar.xz.sig New: ---- 0001-Port-to-KTerminalLauncherJob.patch dolphin-21.08.1.tar.xz dolphin-21.08.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.x9TFy9/_old 2021-09-04 22:34:16.760065950 +0200 +++ /var/tmp/diff_new_pack.x9TFy9/_new 2021-09-04 22:34:16.764065955 +0200 @@ -16,12 +16,11 @@ # -%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: dolphin -Version: 21.08.0 +Version: 21.08.1 Release: 0 Summary: KDE File Manager License: GPL-2.0-or-later @@ -36,6 +35,8 @@ Patch0: dolphin-go_up.diff # PATCH-FIX-OPENSUSE Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Port-to-KTerminalLauncherJob.patch BuildRequires: extra-cmake-modules BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files @@ -53,7 +54,7 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5KIO) >= 5.83 BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5Parts) ++++++ 0001-Port-to-KTerminalLauncherJob.patch ++++++ >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/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 ++++++ dolphin-21.08.0.tar.xz -> dolphin-21.08.1.tar.xz ++++++ ++++ 67990 lines of diff (skipped)
