/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Sep 20 08:19:36 2012 UTC (2 years, 2 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Update pyuno patch wrt bug#435222.

(Portage version: 2.2.0_alpha129/cvs/Linux x86_64)

1 diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
2 index a259bf6..672fa23 100755
3 --- a/desktop/scripts/soffice.sh
4 +++ b/desktop/scripts/soffice.sh
5 @@ -129,6 +129,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 4ff2606..6a05eed 100644
17 --- a/pyuno/source/module/uno.py
18 +++ b/pyuno/source/module/uno.py
19 @@ -16,8 +16,12 @@
20 # except in compliance with the License. You may obtain a copy of
21 # the License at http://www.apache.org/licenses/LICENSE-2.0 .
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 99d3b03..704edab 100755
34 --- a/scripting/source/pyprov/officehelper.py
35 +++ b/scripting/source/pyprov/officehelper.py
36 @@ -44,7 +44,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"

  ViewVC Help
Powered by ViewVC 1.1.20