marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update services

Browse source
This commit is contained in:
Pier Luigi Fiorini 2014-11-02 21:54:05 +01:00
parent 8adc2b185c
commit 409dda41bd
17 changed files with 84 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -38,10 +38,6 @@ plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel)
plasma_install_package(shell org.kde.satellite.phone shells) plasma_install_package(shell org.kde.satellite.phone shells)
install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers") install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers")
configure_file(${CMAKE_SOURCE_DIR}/bin/plasma-phone.cmake ${CMAKE_BINARY_DIR}/plasma-phone) add_subdirectory(bin)
install(FILES ${CMAKE_BINARY_DIR}/plasma-phone
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ GROUP_EXECUTE GROUP_READ
DESTINATION ${BIN_INSTALL_DIR})
add_subdirectory(qmlcomponents) add_subdirectory(qmlcomponents)
add_subdirectory(services)

4
bin/CMakeLists.txt Normal file
View file

@ -0,0 +1,4 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-phone.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ GROUP_EXECUTE GROUP_READ
DESTINATION ${BIN_INSTALL_DIR})

5
bin/plasma-phone.cmake
View file

@ -10,7 +10,4 @@
# (at your option) any later version. # (at your option) any later version.
# #
@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv exec dbus-run-session -- /usr/bin/plasmashell -p org.kde.satellite.phone -n
@CMAKE_INSTALL_FULL_BINDIR@/kbuildsycoca5
LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper
@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.satellite.phone -n

2
dbus/CMakeLists.txt Normal file
View file

@ -0,0 +1,2 @@
install(FILES org.kde.kded5.service
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d)

3
dbus/org.kde.kded5.service Normal file
View file

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.kde.kded5
SystemdService=kded5.service

12
packaging/plasma-phone-components.spec
View file

@ -34,6 +34,7 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(systemd)
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: kf5-rpm-macros BuildRequires: kf5-rpm-macros
BuildRequires: qt5-tools BuildRequires: qt5-tools
@ -124,15 +125,12 @@ Theme=breeze
name=default name=default
EOF EOF
# Install systemd units # Install services links
mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/ mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
#UNITS="compositor kbuildsycoca5 kdeinit ksyncdbusenv shell" UNITS="plasma-phone-compositor plasma-phone-ui"
UNITS="compositor ui"
for service in $UNITS; do for service in $UNITS; do
install -D -m 644 services/plasma-phone-${service}.service %{buildroot}%{_libdir}/systemd/user/plasma-phone-${service}.service ln -sf ../${service}.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/${service}.service
ln -s ../plasma-phone-${service}.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/plasma-phone-${service}.service
done done
# << install post # << install post
%files %files

1
packaging/plasma-phone-components.yaml
View file

@ -37,6 +37,7 @@ PkgConfigBR:
- Qt5Test - Qt5Test
- Qt5Qml - Qt5Qml
- Qt5Quick - Qt5Quick
- systemd
Configure: none Configure: none
Builder: none Builder: none

15
services/CMakeLists.txt Normal file
View file

@ -0,0 +1,15 @@
find_package(PkgConfig REQUIRED)
pkg_check_modules(SYSTEMD systemd REQUIRED)
execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemduserunitdir systemd OUTPUT_VARIABLE SYSTEMD_USER_UNIT_DIR)
string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_USER_UNIT_DIR ${SYSTEMD_USER_UNIT_DIR})
macro(satellite_install_service name)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${name}.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/${name}.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.service
DESTINATION ${SYSTEMD_USER_UNIT_DIR})
endmacro()
satellite_install_service(kded5)
satellite_install_service(kdeinit5)
satellite_install_service(plasma-phone-compositor)
satellite_install_service(plasma-phone-ui)

14
services/kded5.service.cmake Normal file
View file

@ -0,0 +1,14 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts kded5.
#
[Unit]
Description=kded5
Requires=kdeinit5.service
[Service]
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kded5
BusName=org.kde.kded5

15
services/kdeinit5.service.cmake Normal file
View file

@ -0,0 +1,15 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts kdeinit5.
#
[Unit]
Description=kdeinit5
Requires=dbus.socket
[Service]
Environment=DISPLAY:0
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kdeinit5 +kcminit_startup --no-fork
BusName=org.kde.klauncher5

4
services/plasma-phone-compositor.service → services/plasma-phone-compositor.service.cmake
View file

@ -14,8 +14,8 @@ Conflicts=maui-bootsplash.service
Type=notify Type=notify
EnvironmentFile=-/var/lib/environment/compositor/*.conf EnvironmentFile=-/var/lib/environment/compositor/*.conf
EnvironmentFile=-/var/lib/environment/greenisland/*.conf EnvironmentFile=-/var/lib/environment/greenisland/*.conf
ExecStart=/usr/bin/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone
Restart=always Restart=on-failure
[Install] [Install]
WantedBy=user-session.target WantedBy=user-session.target

15
services/plasma-phone-kbuildsycoca5.service
View file

@ -1,15 +0,0 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts kbuildsycoca5 needed by the phone UI.
#
[Unit]
Description=kbuildsycoca5
Requires=dbus.socket
[Service]
ExecStart=/usr/bin/kbuildsycoca5
[Install]
WantedBy=user-session.target

17
services/plasma-phone-kdeinit.service
View file

@ -1,17 +0,0 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts kdeinit needed by the phone UI.
#
[Unit]
Description=kdeinit
Requires=dbus.socket
[Service]
Environment=LD_BIND_NOW=true
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=/usr/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
[Install]
WantedBy=user-session.target

15
services/plasma-phone-ksyncdbusenv.service
View file

@ -1,15 +0,0 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts ksyncdbus needed by the phone UI.
#
[Unit]
Description=ksyncdbusenv
Requires=dbus.socket
[Service]
ExecStart=/usr/lib/libexec/ksyncdbusenv
[Install]
WantedBy=user-session.target

18
services/plasma-phone-shell.service
View file

@ -1,18 +0,0 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts Plasma shell for phones.
#
[Unit]
Description=Plasma Phone UI
Requires=dbus.socket
After=voicecall-manager.service plasma-phone-compositor.service plasma-phone-ksyncdbusenv.service plasma-phone-kbuildsycoca.service plasma-phone-kdeinit.service
[Service]
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=/usr/bin/plasmashell -p org.kde.satellite.phone -n
Restart=always
[Install]
WantedBy=user-session.target

18
services/plasma-phone-ui.service
View file

@ -1,18 +0,0 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts Plasma shell for phones.
#
[Unit]
Description=Plasma Phone UI
Requires=dbus.socket
After=voicecall-manager.service plasma-phone-compositor.service
[Service]
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=/usr/bin/plasma-phone
Restart=always
[Install]
WantedBy=user-session.target

20
services/plasma-phone-ui.service.cmake Normal file
View file

@ -0,0 +1,20 @@
#
# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# Starts Plasma shell for phones.
#
[Unit]
Description=Plasma Phone UI
Requires=plasma-phone-compositor.service voicecall-manager.service kded5.service
After=plasma-phone-compositor.service voicecall-manager.service
[Service]
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma-phone
ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell
Restart=on-failure
BusName=org.kde.plasmashell
[Install]
WantedBy=user-session.target