From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S35qS-0007xK-BO for garchives@archives.gentoo.org; Thu, 01 Mar 2012 13:14:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76B0CE0832; Thu, 1 Mar 2012 13:14:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C1B9E0821 for ; Thu, 1 Mar 2012 13:14:49 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2A3B1B4031 for ; Thu, 1 Mar 2012 13:14:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 89B422004C; Thu, 1 Mar 2012 13:14:47 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-system-pyuno.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-system-pyuno.patch X-VCS-Directories: app-office/libreoffice/files X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20120301131447.89B422004C@flycatcher.gentoo.org> Date: Thu, 1 Mar 2012 13:14:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b8460904-5ed2-4f36-b7e7-9d9507729675 X-Archives-Hash: 4dfae61054ff295556ac4e0101205515 scarabeus 12/03/01 13:14:47 Added: libreoffice-system-pyuno.patch Log: Try to make pyuno work with system python. (works here). Wrt bug#379227= . =20 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64) Revision Changes Path 1.1 app-office/libreoffice/files/libreoffice-system-pyun= o.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/files/libreoffice-system-pyuno.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/files/libreoffice-system-pyuno.patch?rev=3D1.1&content-type=3Dtext/p= lain Index: libreoffice-system-pyuno.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.i= n index defd7b2..ea2a809 100755 --- a/desktop/scripts/soffice.sh.in +++ b/desktop/scripts/soffice.sh.in @@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then exit 1; fi =20 +PYTHONPATH=3D$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 pat= hs 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 =20 +sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') +if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: + os.environ['URE_BOOTSTRAP'] =3D "vnd.sun.star.pathname:%eprefix%/us= r/%libdir%/libreoffice/program/fundamentalrc" import pyuno =20 try: diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/p= yprov/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 =3D os.environ["UNO_PATH"] else: - sOffice =3D "" # lets hope for the best + sOffice =3D "%eprefix%/usr/%libdir%/libreoffice/program" sOffice =3D os.path.join(sOffice, "soffice") if platform.startswith("win"):=20 sOffice +=3D ".exe"