diff options
| author | root <root@rshg054.dnsready.net> | 2011-09-26 23:14:33 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-09-26 23:14:33 +0000 |
| commit | abcf87c553a18aec8372de7f690b5aa91a7a0d24 (patch) | |
| tree | bb3862ac84497766acac0ac182d5ad948e2a382a /extra/libreoffice | |
| parent | 21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff) | |
Mon Sep 26 23:14:33 UTC 2011
Diffstat (limited to 'extra/libreoffice')
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 9898d443e..92f5cb6d6 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136687 2011-08-31 14:13:29Z andyrtr $ +# $Id: PKGBUILD 138502 2011-09-25 14:55:46Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -37,7 +37,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.3.2 pkgver=3.4.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -47,14 +47,14 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-runtime' + 'mesa' 'gstreamer0.10-base' 'java-environment' #'saxon' - currently broken # the depends from libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests + 'ttf-dejavu') # to satisfy regression tests # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors @@ -211,7 +211,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' build() { unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh @@ -343,6 +343,7 @@ build() { --with-system-lucene\ --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-java-target-version=1.5 \ $EXTRAOPTS || return 1 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool |