KDE Release 21.12 RC
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=272
This commit is contained in:
Git OBS Bridge
parent
6ec80547b7
commit
b2e0d07501
@ -1,110 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3b17bfd81dcb04d37810cea0d52d098ce5244289a2eb0173f575291ca97bd9a7
|
||||
size 5327496
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGAgJ4ACgkQu0YzUNbv
|
||||
Me9OhQ/+MsLbp3/cGPLbLI3gLEB9RfmI0lUw4/4N1Fck9Otd/1toFK0B+N4xFBKZ
|
||||
Z5/bXsFlKQtpG+X65xnd8GglP1OwOkynugx8/s4dvq8jqcqGSvlh4I4UKhrov+my
|
||||
W7efgngnyMKXbBUcUIrivis0SPY6LNQ5WpBl6uenaSCQ1dhl/rrJAKW3ncs7J45V
|
||||
xaHrhyETkC4NMHQIjk/iCObeZtrPepoFBOWPg4/RrBYHw2AZbdtdxCoi52OleuMs
|
||||
+31UUxhKMpvhisp97vO0EovI1thFIRhLsEShUYbW0/yoIKCDJZ9ARV6hE73865TX
|
||||
LqVIKnJxQD6/mjaVTBAS09nIiOOyOIHMKzKqDnyb7rIPbHOCnk0EWYGjyX0I51ss
|
||||
AUFAM/0FO6Jay7OJfuBD71ZhpQXOroGj5OIWiYJ3YiqB5iQEO4jZ5fHRucSmAXG1
|
||||
e5k5h14tyGTZawQszyHZVz3hUq2iL7SwVVnnXMkR2tsQ0Ri/Ui/eTwct3Yx37RkT
|
||||
cIW72BHRWihOwvBpmERZs8+4k/pAtLCS+85Zfp5CKTx70tqbLVCgYphkEwb031EF
|
||||
lCyFcz7RJe/+BFLl09mOLqniWGNTvvPRI8mFsVmr0CV0/5mZmj7lrbQM1tWQt4Nd
|
||||
/ZH7LQXVWpD96HF6NCdxpEFBZHqsds1KvJ2DEj/XkUgYD2/aazw=
|
||||
=HAuF
|
||||
-----END PGP SIGNATURE-----
|
||||
3
dolphin-21.11.90.tar.xz
Normal file
3
dolphin-21.11.90.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a9379cf3356474f74447519b2ecbfce25ed897a032447394edbf931c64a695f0
|
||||
size 5320224
|
||||
16
dolphin-21.11.90.tar.xz.sig
Normal file
16
dolphin-21.11.90.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGgJFwACgkQu0YzUNbv
|
||||
Me+gDA//cBq3JKkA9n2cnN+8dfetpTeDUIBo8UQHozItc2z3BINEGJFpWd2riyKE
|
||||
+OYvbimg62hDwsziM/aR8fvbuoaM2AcP4hQMnriOK/2e6fKdFDArhGUx+zMAzXNf
|
||||
49a2abUvK6776PQaJWuPkKzNJMCAg3CPghQq75dP/FxYQtP/GngC2qr2JmD9I3Mv
|
||||
BR6EYJyk3JPTkPJ8ERcLPRhOQWo6WAudep9uxH2GEwGZJbp4CmFBm1CSznkAACeK
|
||||
LntQU86Gm4S7m832VGWqxl9091iJXuj7mhdsbbJvzJva1aMSWSd2wDsFAwZbOSgX
|
||||
mS8VzmzEaAIdr+xgSxS4Rwvl/pkMk6g6zQSw0GdpKkYLygqKtYFxlGxTbgoafHT1
|
||||
b0Hdyv9BdYO8jZMtFhLscId44lr9IKJYf1ZnFZP1M3Vt1aLDaMJryHElyW+unVvM
|
||||
t5Xr1d+vApyMm5QRrfm4kcUnBX1ZwqYAVLio3zcgQ6Vj2/Uege3TnBm0wqZusg+i
|
||||
QdeX9t5nF0mp5ewzBnBeCIWENGpdsTPOMMts33ZDCrAslbsAvYK0PAsXd5FMwY/7
|
||||
D3ROHSgE4ZzGg2RsXY2Msb6ow8pF1XUiwgcvZWdVJ4VTLNCN8KkQ7f2NFe76ag0a
|
||||
aC8tzb4DllCPPMmhy7yRdohkfoWfFY08JGo2mJT7EH4oCNu41qE=
|
||||
=rCXS
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 27 10:10:20 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 21.11.90
|
||||
* New feature release
|
||||
- Changes since 21.11.80:
|
||||
* Fix updating window and tab titles
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 13 17:54:20 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 21.11.80
|
||||
* New feature release
|
||||
- Changes since 21.08.3:
|
||||
* Port ViewModeSettings from macros to std::variant
|
||||
* Remove duplicate include from .h/.cpp
|
||||
* Add support for recentlyused: kio to view properties.
|
||||
* Save size of config dialog in state config
|
||||
* Utilize KXMLGUI API to store state config in separate file
|
||||
* Install KCMs in dolphin/kcms namespace
|
||||
* Fix typo: PascalCase in docs
|
||||
* Change settings window title to "Configure" for consistency sake
|
||||
* Rewrite filter algorithm to properly support filtering with expanded folders under Detail View mode. (kde#411878)
|
||||
* Add kde-ci file
|
||||
* Don't force icon for preferred search tool action if one is manually configured (kde#442815)
|
||||
* Port to KTerminalLauncherJob (kde#441072)
|
||||
* Tabs: ensure to have folder icons for remote folders
|
||||
* [Split view] Reset splitter position on double click (kde#206525)
|
||||
* Revert "Revert "Disable Hidden Files Last sort by default""
|
||||
* Revert "Revert "Configurable Show hidden files and folders last toggle""
|
||||
* Revert "Revert "Show hidden files and folders last""
|
||||
* Use default icon size when resetting zoom level (kde#437349)
|
||||
* DBus activation with filemanager iface
|
||||
* Simplify KFileItemModel's sorting
|
||||
* Avoid crash on start when help actions are restricted through the Kiosk system
|
||||
* Remove unneeded KCM plugin keyword stuff
|
||||
* Use KDirLister directly now that it emits a jobError() signal
|
||||
* [DetailsView] Improve zooming
|
||||
* [PlacesPanel] Remove horizontal scrollbar (kde#301758)
|
||||
* Delete some items that were intended to be deleted. Avoid trying to delete items that don't exist
|
||||
* Allow to have HiDpi previews (kde#401170)
|
||||
* Don't exit immediately if DBus isn't running
|
||||
* Avoid crashing on startup if DBus isn't running
|
||||
- Drop upstream patch:
|
||||
* 0001-Port-to-KTerminalLauncherJob.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 2 21:33:17 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
15
dolphin.spec
15
dolphin.spec
@ -16,27 +16,26 @@
|
||||
#
|
||||
|
||||
|
||||
%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.3
|
||||
Version: 21.11.90
|
||||
Release: 0
|
||||
Summary: KDE File Manager
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/File utilities
|
||||
URL: https://apps.kde.org/dolphin
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
%if %{with lang}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
Source3: dolphinsu.desktop
|
||||
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
|
||||
@ -54,7 +53,7 @@ BuildRequires: cmake(KF5FileMetaData)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: cmake(KF5IconThemes)
|
||||
BuildRequires: cmake(KF5KCMUtils)
|
||||
BuildRequires: cmake(KF5KIO) >= 5.83
|
||||
BuildRequires: cmake(KF5KIO)
|
||||
BuildRequires: cmake(KF5NewStuff)
|
||||
BuildRequires: cmake(KF5Notifications)
|
||||
BuildRequires: cmake(KF5Parts)
|
||||
@ -162,7 +161,9 @@ Provides translations for the "%{name}" package.
|
||||
%{_kf5_debugdir}/dolphin.categories
|
||||
%{_kf5_knsrcfilesdir}/servicemenu.knsrc
|
||||
%{_kf5_libdir}/libdolphinprivate.so.*
|
||||
%{_kf5_plugindir}/kcm_dolphin*.so
|
||||
%dir %{_kf5_plugindir}/dolphin
|
||||
%dir %{_kf5_plugindir}/dolphin/kcms
|
||||
%{_kf5_plugindir}/dolphin/kcms/libkcm_dolphin*.so
|
||||
%dir %{_kf5_plugindir}/kf5
|
||||
%dir %{_kf5_plugindir}/kf5/parts
|
||||
%{_kf5_plugindir}/kf5/parts/dolphinpart.so
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user