mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-04 17:47:04 +00:00
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: - https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/5 to simplify the systemd service templating + install - https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/17 to generate the dbus service file automatically needs https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/25
This commit is contained in:
parent
154843406d
commit
e36de310cb
3 changed files with 21 additions and 8 deletions
|
@ -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)
|
||||
|
@ -166,10 +168,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)
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
[D-BUS Service]
|
||||
Name=org.freedesktop.FileManager1
|
||||
Exec=@CMAKE_INSTALL_PREFIX@/bin/dolphin --daemon
|
8
plasma-dolphin.service.in
Normal file
8
plasma-dolphin.service.in
Normal file
|
@ -0,0 +1,8 @@
|
|||
[Unit]
|
||||
Description=Dolphin file manager
|
||||
PartOf=graphical-session.target
|
||||
|
||||
[Service]
|
||||
ExecStart=@KDE_INSTALL_FULL_BINDIR@/dolphin --daemon
|
||||
BusName=org.freedesktop.FileManager1
|
||||
Slice=background.slice
|
Loading…
Reference in a new issue