f720b7a968
- rework a port a little bit to be sync in the openoffice linux code and remove some hacks that we don't need anymore - also use --as-needed while linking (which results in at least a 50% speed improovement) - depend on more libraries from the system instead of using the internal ones
33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
$OpenBSD: patch-desktop_scripts_soffice_sh,v 1.6 2010/11/09 18:40:04 robert Exp $
|
|
--- desktop/scripts/soffice.sh.orig.port Thu Oct 21 13:29:19 2010
|
|
+++ desktop/scripts/soffice.sh Sat Oct 23 18:40:06 2010
|
|
@@ -35,6 +35,11 @@
|
|
SAL_ENABLE_FILE_LOCKING=1
|
|
export SAL_ENABLE_FILE_LOCKING
|
|
|
|
+if [ -z $SAL_USE_VCLPLUGIN ]; then
|
|
+ export SAL_USE_VCLPLUGIN=gtk
|
|
+fi
|
|
+export SAL_ENABLE_NATIVE_XFONTS=0
|
|
+
|
|
# Uncomment the line below if you suspect that OpenGL is not
|
|
# working on your system.
|
|
# SAL_NOOPENGL=true; export SAL_NOOPENGL
|
|
@@ -90,6 +95,16 @@ for sd_arg in "$@"; do
|
|
done
|
|
"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
|
|
${sd_pagein_args}
|
|
+
|
|
+# this is a temporary hack until we can live with the default search paths
|
|
+case "`uname -s`" in
|
|
+OpenBSD)
|
|
+ sd_prog1="$sd_prog/../basis-link/program"
|
|
+ sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
|
+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
|
+ export LD_LIBRARY_PATH
|
|
+ ;;
|
|
+esac
|
|
|
|
# extend the ld_library_path for java: javaldx checks the sofficerc for us
|
|
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
|