libreoffice/system-pyuno.diff

45 lines
1.7 KiB
Diff
Raw Normal View History

Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
===================================================================
--- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh
+++ libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then
exit 1;
fi
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
+export PYTHONPATH
+
case "`uname -s`" in
NetBSD|OpenBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
===================================================================
--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
@@ -16,8 +16,12 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+import os
import sys
+sys.path.append('@INSTALLDIR@/program')
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
import pyuno
try:
Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
===================================================================
--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
@@ -44,7 +44,7 @@ def bootstrap():
if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"]
else:
- sOffice = "" # lets hope for the best
+ sOffice = "@INSTALLDIR@/program"
sOffice = os.path.join(sOffice, "soffice")
if platform.startswith("win"):
sOffice += ".exe"