epel9
Rex Dieter 4 years ago
parent e0ebec29b4
commit 424cc6fda8

1
.gitignore vendored

@ -1 +1,2 @@
/dolphin-20.08.3.tar.xz /dolphin-20.08.3.tar.xz
/dolphin-20.12.1.tar.xz

@ -1,43 +0,0 @@
From bf11c835ebd934d9916327262f23edb25aeb8ab8 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Thu, 29 Oct 2020 15:00:39 -0600
Subject: [PATCH 75/75] Disable session management for daemon
We don't need to autostart the daemon if it was running at logout.
BUG: 417219
FIXED-IN: 20.12
---
src/main.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/main.cpp b/src/main.cpp
index 9191127e5..d557f2ea0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@
#include <QDBusInterface>
#include <QDBusAbstractInterface>
#include <QDBusConnectionInterface>
+#include <QSessionManager>
#ifndef Q_OS_WIN
#include <unistd.h>
@@ -132,6 +133,14 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
if (parser.isSet(QStringLiteral("daemon"))) {
+ // Disable session management for the daemonized version
+ // See https://bugs.kde.org/show_bug.cgi?id=417219
+ auto disableSessionManagement = [](QSessionManager &sm) {
+ sm.setRestartHint(QSessionManager::RestartNever);
+ };
+ QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
+ QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+
KDBusService dolphinDBusService;
DBusInterface interface;
interface.setAsDaemon();
--
2.28.0

@ -14,11 +14,11 @@
Name: dolphin Name: dolphin
Summary: KDE File Manager Summary: KDE File Manager
Version: 20.08.3 Version: 20.12.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://cgit.kde.org/%{name}.git/ URL: https://invent.kde.org/system/dolphin
%global revision %(echo %{version} | cut -d. -f3) %global revision %(echo %{version} | cut -d. -f3)
%global majmin_ver %(echo %{version} | cut -d. -f1,2) %global majmin_ver %(echo %{version} | cut -d. -f1,2)
%if %{revision} >= 50 %if %{revision} >= 50
@ -29,7 +29,6 @@ URL: https://cgit.kde.org/%{name}.git/
Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz
## upstream patches (master) ## upstream patches (master)
Patch75: 0075-Disable-session-management-for-daemon.patch
# for %%check # for %%check
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -178,6 +177,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
%changelog %changelog
* Fri Jan 15 14:17:03 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.1-1
- 20.12.1
* Wed Nov 4 13:52:11 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.3-1 * Wed Nov 4 13:52:11 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.3-1
- 20.08.3 - 20.08.3

@ -1 +1 @@
SHA512 (dolphin-20.08.3.tar.xz) = 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c SHA512 (dolphin-20.12.1.tar.xz) = a9f04b1dce709afebde3c60e356750ae2e6b32209cf9251845a348594047eeca1c98942de6125d9b4eaa1db596fc598ef9467185072d220c430e1499f5ef56e8

Loading…
Cancel
Save