diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt index 38f42a29..30124367 100644 --- a/dbus/CMakeLists.txt +++ b/dbus/CMakeLists.txt @@ -1,2 +1,9 @@ -install(FILES org.kde.kded5.service - DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d) +macro(satellite_install_dbus_service name) + install(FILES ${name}.service + DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d) +endmacro() + +satellite_install_dbus_service(org.kde.kde5) +satellite_install_dbus_service(org.kde.kglobalaccel) +satellite_install_dbus_service(org.kde.klauncher5) +satellite_install_dbus_service(org.kde.kuiserver) diff --git a/dbus/org.kde.kglobalaccel.service b/dbus/org.kde.kglobalaccel.service new file mode 100644 index 00000000..84ac9151 --- /dev/null +++ b/dbus/org.kde.kglobalaccel.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.kglobalaccel +SystemdService=kglobalaccel5.service diff --git a/dbus/org.kde.klauncher5.service b/dbus/org.kde.klauncher5.service new file mode 100644 index 00000000..4e68ed3f --- /dev/null +++ b/dbus/org.kde.klauncher5.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.klauncher5 +SystemdService=kdeinit5.service diff --git a/dbus/org.kde.kuiserver.service b/dbus/org.kde.kuiserver.service new file mode 100644 index 00000000..e7ee51d8 --- /dev/null +++ b/dbus/org.kde.kuiserver.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.kuiserver +SystemdService=kuiserver5.service diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index c61e3706..3dfbad07 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -9,7 +9,10 @@ macro(satellite_install_service name) DESTINATION ${SYSTEMD_USER_UNIT_DIR}) endmacro() +satellite_install_service(kactivitymanagerd) satellite_install_service(kded5) satellite_install_service(kdeinit5) +satellite_install_service(kglobalaccel5) +satellite_install_service(kuiserver5) satellite_install_service(plasma-phone-compositor) satellite_install_service(plasma-phone-ui) diff --git a/services/kactivitymanagerd.service.cmake b/services/kactivitymanagerd.service.cmake new file mode 100644 index 00000000..8075b28f --- /dev/null +++ b/services/kactivitymanagerd.service.cmake @@ -0,0 +1,14 @@ +# +# Copyright (C) 2014 Pier Luigi Fiorini +# +# Starts kactivitymanagerd. +# + +[Unit] +Description=kactivitymanagerd + +[Service] +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket +EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kactivitymanagerd start-daemon +BusName=org.kde.ActivityManager diff --git a/services/kded5.service.cmake b/services/kded5.service.cmake index 5f2b62ef..96d03751 100644 --- a/services/kded5.service.cmake +++ b/services/kded5.service.cmake @@ -9,6 +9,7 @@ Description=kded5 Requires=kdeinit5.service [Service] +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kded5 BusName=org.kde.kded5 diff --git a/services/kdeinit5.service.cmake b/services/kdeinit5.service.cmake index 435032c7..19a596fa 100644 --- a/services/kdeinit5.service.cmake +++ b/services/kdeinit5.service.cmake @@ -10,6 +10,7 @@ Requires=dbus.socket [Service] Environment=DISPLAY:0 +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kdeinit5 +kcminit_startup --no-fork BusName=org.kde.klauncher5 diff --git a/services/kglobalaccel5.service.cmake b/services/kglobalaccel5.service.cmake new file mode 100644 index 00000000..75e52430 --- /dev/null +++ b/services/kglobalaccel5.service.cmake @@ -0,0 +1,14 @@ +# +# Copyright (C) 2014 Pier Luigi Fiorini +# +# Starts kglobalaccel5. +# + +[Unit] +Description=kglobalaccel5 + +[Service] +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket +EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kglobalaccel5 +BusName=org.kde.kglobalaccel diff --git a/services/kuiserver5.service.cmake b/services/kuiserver5.service.cmake new file mode 100644 index 00000000..4e0bb2c6 --- /dev/null +++ b/services/kuiserver5.service.cmake @@ -0,0 +1,14 @@ +# +# Copyright (C) 2014 Pier Luigi Fiorini +# +# Starts kuiserver5. +# + +[Unit] +Description=kuiserver5 + +[Service] +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket +EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5 +BusName=org.kde.kuiserver