From 5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Apr 2013 00:54:45 -0700 Subject: Sun Apr 7 00:54:38 PDT 2013 --- extra/libreoffice/PKGBUILD | 21 +++++++++++++-------- extra/libreoffice/libreoffice-common.csh | 2 -- extra/libreoffice/libreoffice-common.sh | 2 -- ...-pyuno-work-with-system-wide-module-install.diff | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) (limited to 'extra/libreoffice') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index c5a381df5..cb897bcbb 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181859 2013-04-04 18:56:27Z andyrtr $ +# $Id: PKGBUILD 182085 2013-04-06 18:07:38Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.2.2 pkgver=4.0.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -152,9 +152,9 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf' '107a3d18f637b342684b3c21eb0fcd7d' '881c4628ec5f54d47f35d5d19e335662' '92bde158f249b9b27f76f48cc65a0242' - '97bf43dda273d79ff90c848ab53b0e3c' - 'abcb1b0a7deaffe13ab3d7ca70becb49' - '72790a4103da259a55cadd66db931d00' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' '941aab11a42c8052cc1999434ae82bcd' 'caf426e9eefb99108adba6cf231de348' 'c367454b402720eea064280d0dfb291b' @@ -190,7 +190,7 @@ build() { popd # fix not upstreamable pyuno paths - patch taken from Debian -# patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -300,7 +300,7 @@ package_libreoffice-common() { install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -347,7 +347,7 @@ package_libreoffice-common() { cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - # set VLC and if needed python-uno PYTHON path + # allow to preset desired VLC install -dm755 ${pkgdir}/etc/profile.d install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ @@ -361,6 +361,11 @@ package_libreoffice-common() { rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + # workaround all packages now depend on that file cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh index 5efa39404..502512189 100644 --- a/extra/libreoffice/libreoffice-common.csh +++ b/extra/libreoffice/libreoffice-common.csh @@ -1,5 +1,3 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program - # to force a certain look'n feel #setenv SAL_USE_VCLPLUGIN gen diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh index 795867125..7bfdcf7f6 100644 --- a/extra/libreoffice/libreoffice-common.sh +++ b/extra/libreoffice/libreoffice-common.sh @@ -1,5 +1,3 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" - # to force a certain look'n feel #export SAL_USE_VCLPLUGIN=gen diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff index e86548136..3317b3ca5 100644 --- a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff +++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -17,9 +17,9 @@ 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. + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . # - #************************************************************************* +import os import sys @@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o index 610ac5f..df243d0 100755 --- a/scripting/source/pyprov/officehelper.py +++ b/scripting/source/pyprov/officehelper.py -@@ -53,7 +53,7 @@ def bootstrap(): +@@ -44,7 +44,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"): + if platform.startswith("win"): sOffice += ".exe" -- cgit v1.2.3-54-g00ecf