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

Set DBUS_SESSION_BUS_ADDRESS directly on services

Browse source 
Rather than from environment configuration file so that systemd will
expand %t.
This commit is contained in:
Pier Luigi Fiorini 2014-11-03 18:33:52 +01:00
parent 0444e8ac20
commit fb865c86da
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,8 +86,6 @@ cat > %{buildroot}%{_sharedstatedir}/environment/plasma-phone/plasma-phone.conf
LIBEXEC_PATH="%{_libexecdir}:%{_libdir}/libexec:%{_kf5_libexecdir}" LIBEXEC_PATH="%{_libexecdir}:%{_libdir}/libexec:%{_kf5_libexecdir}"
QT_PLUGIN_PATH=\${QT_PLUGIN_PATH+\$QT_PLUGIN_PATH:}\`qtpaths --plugin-dir\`:%{_libdir}/kde5/plugins QT_PLUGIN_PATH=\${QT_PLUGIN_PATH+\$QT_PLUGIN_PATH:}\`qtpaths --plugin-dir\`:%{_libdir}/kde5/plugins
DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
QT_QPA_PLATFORM=wayland QT_QPA_PLATFORM=wayland
QT_QPA_PLATFORMTHEME=KDE QT_QPA_PLATFORMTHEME=KDE
QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_WAYLAND_DISABLE_WINDOWDECORATION=1

1
services/plasma-phone-compositor.service.cmake
View file

@ -12,6 +12,7 @@ Conflicts=maui-bootsplash.service
[Service] [Service]
Type=notify Type=notify
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
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=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone

1
services/plasma-phone-ui.service.cmake
View file

@ -9,6 +9,7 @@ Description=Plasma Phone UI
Requires=dbus.socket plasma-phone-compositor.service Requires=dbus.socket plasma-phone-compositor.service
[Service] [Service]
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma-phone ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma-phone
ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell