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

[andyrtr at archlinux.org]

    Date: Monday, November 7, 2011 @ 11:40:02
  Author: andyrtr
Revision: 142266

upgpkg: libreoffice 3.4.4-2

bring back openjdk7 detection

Modified:
  libreoffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-07 16:00:54 UTC (rev 142265)
+++ PKGBUILD	2011-11-07 16:40:02 UTC (rev 142266)
@@ -37,14 +37,14 @@
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.4.2
 pkgver=3.4.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 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.
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment'
@@ -89,7 +89,6 @@
 	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	#http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
@@ -104,6 +103,7 @@
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
 	scp2-more-reasonable-file-access-rights.diff
+	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
 	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -140,9 +140,7 @@
 	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
 	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	#f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	)
+	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
 md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
          'db423cbb1cee416b718138044a5de930'
          '31944d2139d6d81ef1131bd513530621'
@@ -202,9 +200,9 @@
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
          '37638431e7e40baf2e47966ebb9bc0e9'
+         '3c6c62e77c30649a3dfe73512947cc9a'
          'eb35d4c715e0dfc23bbc706996033829')
 
-
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
@@ -233,6 +231,7 @@
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+	patch -Np1 -i ${srcdir}/oracle-recognition.diff
 	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
 	
 	# unset C(XX)FLAGS