Re: [Libreoffice] [PATCH] Make pyuno work with system python

Dne 22.8.2011 12:18, Michael Meeks napsal(a):
> On Mon, 2011-08-22 at 11:00 +0100, Caolán McNamara wrote:
> > a) do we need the PYTHONPATH hack in soffice.sh, I seem to be able to
> > get away without it ?
>         On my slow motion mission to kill the shell-piece of LibreOffice
> startup completely, I'm not a huge fan of yet more going into there,
> unless it is totally unavoidable. Having said that, now I look at
> soffice.sh it seems to have sprouted dozens of more lines since I last
> read it ... ;-)
>
>         ATB,
>
>                 Michael.
That you guys tell me, I was not sure if it is really needed.
It worked without it just fine but it was in the patch so I supposed it 
has some hidden meaning.

Attaching the patch without the .sh altering.

From 7bb562215c96282bc3fc45c6f826a2993c6dbe84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
Date: Mon, 22 Aug 2011 11:29:44 +0200
Subject: [PATCH] Try to make pyuno work with system python.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Consolidate two patches from build:
        pyuno-oodir.diff.in
        system-python-ure-bootstrap.diff.in

Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
---
 configure.in                              |    7 ++++++-
 pyuno/source/module/{uno.py => uno.py.in} |    5 +++++
 2 files changed, 11 insertions(+), 1 deletions(-)
 rename pyuno/source/module/{uno.py => uno.py.in} (98%)

diff --git a/configure.in b/configure.in
index 244e0ef..5d20d4e 100755
--- a/configure.in
+++ b/configure.in
@@ -9158,7 +9158,12 @@ else
     echo > set_soenv.last
 fi
 
-AC_OUTPUT([set_soenv Makefile bin/repo-list])
+AC_OUTPUT([
+set_soenv
+Makefile
+bin/repo-list
+pyuno/source/module/uno.py
+])
 
 # touch the config timestamp file set_soenv.stamp
 if test ! -f set_soenv.stamp; then
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py.in
similarity index 98%
rename from pyuno/source/module/uno.py
rename to pyuno/source/module/uno.py.in
index e82d9d6..11dc0ef 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py.in
@@ -26,8 +26,13 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+import os
 import sys
 
+sys.path.append('@libdir@/@OOOINSTALLDIRNAME@/basis-link/program')
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
+    os.environ['URE_BOOTSTRAP'] = 
"vnd.sun.star.pathname:@libdir@/@OOOINSTALLDIRNAME@/program/fundamentalrc"
+
 import pyuno
 
 try:
-- 
1.7.6