| 1 |
scarabeus |
1.1 |
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
|
| 2 |
|
|
index defd7b2..ea2a809 100755
|
| 3 |
|
|
--- a/desktop/scripts/soffice.sh
|
| 4 |
|
|
+++ b/desktop/scripts/soffice.sh
|
| 5 |
|
|
@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
|
| 6 |
|
|
exit 1;
|
| 7 |
|
|
fi
|
| 8 |
|
|
|
| 9 |
|
|
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
|
| 10 |
|
|
+export PYTHONPATH
|
| 11 |
|
|
+
|
| 12 |
|
|
case "`uname -s`" in
|
| 13 |
|
|
NetBSD|OpenBSD|FreeBSD|DragonFly)
|
| 14 |
|
|
# this is a temporary hack until we can live with the default search paths
|
| 15 |
|
|
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
|
| 16 |
|
|
index f93ac5e..92a2891 100644
|
| 17 |
|
|
--- a/pyuno/source/module/uno.py
|
| 18 |
|
|
+++ b/pyuno/source/module/uno.py
|
| 19 |
|
|
@@ -26,8 +26,12 @@
|
| 20 |
|
|
# for a copy of the LGPLv3 License.
|
| 21 |
|
|
#
|
| 22 |
|
|
#*************************************************************************
|
| 23 |
|
|
+import os
|
| 24 |
|
|
import sys
|
| 25 |
|
|
|
| 26 |
|
|
+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
|
| 27 |
|
|
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
| 28 |
|
|
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
|
| 29 |
|
|
import pyuno
|
| 30 |
|
|
|
| 31 |
|
|
try:
|
| 32 |
|
|
diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
|
| 33 |
|
|
index 610ac5f..df243d0 100755
|
| 34 |
|
|
--- a/scripting/source/pyprov/officehelper.py
|
| 35 |
|
|
+++ b/scripting/source/pyprov/officehelper.py
|
| 36 |
|
|
@@ -53,7 +53,7 @@ def bootstrap():
|
| 37 |
|
|
if "UNO_PATH" in os.environ:
|
| 38 |
|
|
sOffice = os.environ["UNO_PATH"]
|
| 39 |
|
|
else:
|
| 40 |
|
|
- sOffice = "" # lets hope for the best
|
| 41 |
|
|
+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
|
| 42 |
|
|
sOffice = os.path.join(sOffice, "soffice")
|
| 43 |
|
|
if platform.startswith("win"):
|
| 44 |
|
|
sOffice += ".exe"
|
Parent Directory
| 
Revision Log