From 1f52bfb67cfb0c2ceec862e1aab9f5667c9100ee Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 2 May 2018 22:46:01 +0200 Subject: [PATCH] libreoffice: wrapper: do not set SAL_USE_VCLPLUGIN for now --- pkgs/applications/office/libreoffice/wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 52cd91e8030e..cff8f200e2bc 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -1,13 +1,13 @@ #!@bash@/bin/bash export JAVA_HOME="${JAVA_HOME:-@jdk@}" -export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" +#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" if uname | grep Linux > /dev/null && ! ( 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")" - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" fi