File system-pyuno.diff of Package libreoffice.1866

Overview Repositories Revisions Requests Users Attributes Meta

File system-pyuno.diff of Package libreoffice.1866

diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh
--- libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh	2012-12-19 19:09:46.518989541 +0100
+++ libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh	2012-12-19 19:10:21.810986269 +0100
@@ -120,6 +120,9 @@
     exit 1;
 fi
 
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
+export PYTHONPATH
+
 case "`uname -s`" in
 NetBSD|OpenBSD|FreeBSD|DragonFly)
 # this is a temporary hack until we can live with the default search paths
diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py
--- libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py	2012-12-19 19:09:49.483989266 +0100
+++ libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py	2012-12-19 19:10:21.810986269 +0100
@@ -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:
diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py
--- libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py	2012-12-19 19:09:46.868989508 +0100
+++ libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py	2012-12-19 19:10:21.810986269 +0100
@@ -44,7 +44,7 @@
         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"

Places

File system-pyuno.diff of Package libreoffice.1866

Places