diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
commit | d53c17bfc7766efa4bcb43eecc2906938d3d2ee9 (patch) | |
tree | 8f29b8f00ba7758d04e66c3b3ab2bbe71363bceb /testing/libreoffice | |
parent | 23c40f4e35b9164f83c5bcf376056bca0546f69e (diff) | |
parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/freewrl/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/gpac/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/smc/PKGBUILD
community/blobby2/PKGBUILD
community/jack2/PKGBUILD
community/kleansweep/PKGBUILD
core/gcc/PKGBUILD
extra/at/PKGBUILD
extra/maxima/PKGBUILD
extra/nicotine/PKGBUILD
extra/python-geoip/PKGBUILD
extra/sqlite/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gst-plugins-base/PKGBUILD
gnome-unstable/gstreamer/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/libtool-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
staging/mesa/PKGBUILD
testing/bzflag/PKGBUILD
testing/cabal-install/PKGBUILD
testing/cairo/PKGBUILD
testing/gcc/PKGBUILD
testing/glew/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libtool/PKGBUILD
testing/mesa/PKGBUILD
testing/nx/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-intel/xf86-video-intel.install
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'testing/libreoffice')
-rw-r--r-- | testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..e86548136 --- /dev/null +++ b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + 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 --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,12 @@ + # for a copy of the LGPLv3 License. + # + #************************************************************************* ++import os + import sys + ++sys.path.append('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py +index 610ac5f..df243d0 100755 +--- a/scripting/source/pyprov/officehelper.py ++++ b/scripting/source/pyprov/officehelper.py +@@ -53,7 +53,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" |