| 1 |
dilfridge 15/02/08 18:53:59 |
| 2 |
|
| 3 |
Added: libreoffice-4.4-system-pyuno.patch |
| 4 |
Log: |
| 5 |
Update live ebuilds for LibreOffice 4.4, thanks Andreas Sturmlechner |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libreoffice-4.4-system-pyuno.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh |
| 18 |
index a259bf6..672fa23 100755 |
| 19 |
--- a/desktop/scripts/soffice.sh |
| 20 |
+++ b/desktop/scripts/soffice.sh |
| 21 |
@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then |
| 22 |
exit 1; |
| 23 |
fi |
| 24 |
|
| 25 |
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} |
| 26 |
+export PYTHONPATH |
| 27 |
+ |
| 28 |
case "`uname -s`" in |
| 29 |
NetBSD|OpenBSD|FreeBSD|DragonFly) |
| 30 |
# this is a temporary hack until we can live with the default search paths |
| 31 |
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py |
| 32 |
index 4ff2606..6a05eed 100644 |
| 33 |
--- a/pyuno/source/module/uno.py |
| 34 |
+++ b/pyuno/source/module/uno.py |
| 35 |
@@ -16,8 +16,12 @@ |
| 36 |
# except in compliance with the License. You may obtain a copy of |
| 37 |
# the License at http://www.apache.org/licenses/LICENSE-2.0 . |
| 38 |
# |
| 39 |
+import os |
| 40 |
import sys |
| 41 |
|
| 42 |
+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') |
| 43 |
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: |
| 44 |
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" |
| 45 |
import pyuno |
| 46 |
|
| 47 |
try: |
| 48 |
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py |
| 49 |
index 99d3b03..704edab 100755 |
| 50 |
--- a/pyuno/source/officehelper.py |
| 51 |
+++ b/pyuno/source/officehelper.py |
| 52 |
@@ -44,7 +44,7 @@ def bootstrap(): |
| 53 |
if "UNO_PATH" in os.environ: |
| 54 |
sOffice = os.environ["UNO_PATH"] |
| 55 |
else: |
| 56 |
- sOffice = "" # lets hope for the best |
| 57 |
+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" |
| 58 |
sOffice = os.path.join(sOffice, "soffice") |
| 59 |
if platform.startswith("win"): |
| 60 |
sOffice += ".exe" |
Archives