From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Wed, 4 Nov 2020 00:12:48 +0000 (+0100)
Subject: Revert "D-Bus activation systemd service"
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/957cc92f46203f1403a812cbc224123f6b5ed036?ds=sidebyside

Revert "D-Bus activation systemd service"

This reverts commit eb441b11885fc44dcba1bef693b95819657ed753.

We'll push it again after we branch 20.12. We don't want to push a too
recent version of KF5 on distros.

!27
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c969465c..c1b1a7b84 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.14.0")
-set(KF5_MIN_VERSION "5.75.0")
+set(KF5_MIN_VERSION "5.73.0")
 
 # ECM setup
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -16,8 +16,6 @@ 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)
@@ -157,16 +155,10 @@ install(FILES
     COMPONENT Devel
 )
 
-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})
-
+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})
 install(FILES dolphin.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/org.kde.dolphin.FileManager1.service.in b/org.kde.dolphin.FileManager1.service.in
new file mode 100644
index 000000000..c1258bb6b
--- /dev/null
+++ b/org.kde.dolphin.FileManager1.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.FileManager1
+Exec=@CMAKE_INSTALL_PREFIX@/bin/dolphin --daemon
diff --git a/plasma-dolphin.service.in b/plasma-dolphin.service.in
deleted file mode 100644
index d4cdd694b..000000000
--- a/plasma-dolphin.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Dolphin file manager
-PartOf=graphical-session.target
-
-[Service]
-ExecStart=@KDE_INSTALL_FULL_BINDIR@/dolphin --daemon
-BusName=org.freedesktop.FileManager1
-Slice=background.slice