From e471376982d5c404c0d5fb376f1e48fa4b7859ba Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 15 Apr 2018 08:33:10 +0200 Subject: [PATCH] libreoffice: wrapper: apparently session bus for DBus is enough, and adding a local system bus when a session bus is present makes things worse --- pkgs/applications/office/libreoffice/wrapper.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 591b4251506..52cd91e8030 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -3,21 +3,12 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}" export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" if uname | grep Linux > /dev/null && - ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && - test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then + ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" mkdir "$dbus_tmp_dir" dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" - cat "@dbus@/share/dbus-1/system.conf" | - grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf" - if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & - export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" - fi - if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 & - export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system" - fi + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" fi "@libreoffice@/bin/$(basename "$0")" "$@"