[arch-commits] Commit in libreoffice/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, September 25, 2011 @ 10:04:46
  Author: andyrtr
Revision: 138495

upgpkg: libreoffice 3.4.3-2

vigra rebuild; build with java7

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-25 10:07:36 UTC (rev 138494)
+++ PKGBUILD	2011-09-25 14:04:46 UTC (rev 138495)
@@ -37,7 +37,7 @@
 	'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 @@
              '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 @@
 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 @@
 		--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