You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.6 KiB
45 lines
1.6 KiB
8 years ago
|
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
|
||
|
index a259bf6..672fa23 100755
|
||
|
--- a/desktop/scripts/soffice.sh
|
||
|
+++ b/desktop/scripts/soffice.sh
|
||
|
@@ -129,6 +129,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
|
||
|
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
|
||
|
index 4ff2606..6a05eed 100644
|
||
|
--- a/pyuno/source/module/uno.py
|
||
|
+++ b/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('%eprefix%/usr/%libdir%/libreoffice/program')
|
||
|
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
||
|
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
|
||
|
import pyuno
|
||
|
|
||
|
try:
|
||
|
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
|
||
|
index 99d3b03..704edab 100755
|
||
|
--- a/pyuno/source/officehelper.py
|
||
|
+++ b/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 = "%eprefix%/usr/%libdir%/libreoffice/program"
|
||
|
sOffice = os.path.join(sOffice, "soffice")
|
||
|
if platform.startswith("win"):
|
||
|
sOffice += ".exe"
|