Commit e4713769 authored by Michael Raskin's avatar Michael Raskin
Browse files

libreoffice: wrapper: apparently session bus for DBus is enough, and adding a... 

libreoffice: wrapper: apparently session bus for DBus is enough, and adding a local system bus when a session bus is present makes things worse
parent d7271088

pkgs/applications/office/libreoffice/wrapper.sh

+3 −12
Original line number Diff line number Diff line
@@ -3,22 +3,13 @@ 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

fi



"@libreoffice@/bin/$(basename "$0")" "$@"

code="$?"