Commit eb441b11 authored by Henri Chain's avatar Henri Chain

D-Bus activation systemd service

Correctly scopes dolphin in systemd service `app-org.kde.dolphin.service` when dbus-activated (while still working if systemd is not present), as per https://systemd.io/DESKTOP_ENVIRONMENTS/

uses new ECM modules:
- frameworks/extra-cmake-modules!5 to simplify the systemd service templating + install
- frameworks/extra-cmake-modules!17 to generate the dbus service file automatically

needs frameworks/extra-cmake-modules!25
parent 40cc9113
......@@ -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.14.0")
set(KF5_MIN_VERSION "5.73.0")
set(KF5_MIN_VERSION "5.75.0")
# ECM setup
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
......@@ -16,6 +16,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMGenerateDBusServiceFile)
include(ECMConfiguredInstall)
include(CMakePackageConfigHelpers)
include(GenerateExportHeader)
include(FeatureSummary)
......@@ -155,10 +157,16 @@ install(FILES
COMPONENT Devel
)
configure_file(org.kde.dolphin.FileManager1.service.in
${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
ecm_generate_dbus_service_file(
NAME org.freedesktop.FileManager1
EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon"
SYSTEMD_SERVICE plasma-dolphin.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
RENAME org.kde.dolphin.FileManager1.service
)
ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
......
[D-BUS Service]
Name=org.freedesktop.FileManager1
Exec=@CMAKE_INSTALL_PREFIX@/bin/dolphin --daemon
[Unit]
Description=Dolphin file manager
PartOf=graphical-session.target
[Service]
ExecStart=@KDE_INSTALL_FULL_BINDIR@/dolphin --daemon
BusName=org.freedesktop.FileManager1
Slice=background.slice
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment