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

[andyrtr at archlinux.org]

    Date: Monday, May 30, 2011 @ 05:43:02
  Author: andyrtr
Revision: 125824

upgpkg: libreoffice 3.4.0-1
upstream update 3.4.0; make java-runtime an optional dependency

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-30 09:26:32 UTC (rev 125823)
+++ PKGBUILD	2011-05-30 09:43:02 UTC (rev 125824)
@@ -25,7 +25,7 @@
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.0.2
-pkgver=3.4rc2
+pkgver=3.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
@@ -36,13 +36,13 @@
              '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'
+	     'mesa' 'gstreamer0.10-base' 'java-runtime'
               #'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' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'java-runtime' 'gtk2' # keep gtk2 for install script
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script
 	     '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
@@ -262,7 +262,7 @@
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
-		--enable-verbose \
+		--disable-verbose \
 		--enable-cairo\
 		--enable-crashdump \
 		--enable-dbus \
@@ -356,9 +356,10 @@
  depends=("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' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'java-runtime' 'gtk2') # keep gtk2 for install script
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script 
+	  #'java-runtime' 
           #'saxon'
- optdepends=( #'java-runtime:     adds java support'
+ optdepends=('java-runtime:     adds java support'
              'libcups:          adds printing support'
              'gconf:            adds additional gnome support'
              'nss:              adds support for signed files/macros'