Fri Jul 13 00:01:54 UTC 2012

1 files changed, 43 insertions, 28 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 8e2755bfa..099f64e0c 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162357 2012-06-25 18:51:18Z foutrelis $
+# $Id: PKGBUILD 163246 2012-07-11 20:12:36Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -21,15 +21,17 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-report-builder'
 	'libreoffice-scripting-beanshell'
 	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.4.2
-pkgver=3.5.4
-pkgrel=2
+	'libreoffice-extension-scripting-python'
+	'libreoffice-extension-wiki-publisher'
+	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
+_LOver=3.5.5.3
+pkgver=3.5.5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost'
              'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
@@ -49,8 +51,8 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-#	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -81,9 +83,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
 	fix_broken_hebrew_wordwrapping.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-#	90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -110,11 +112,12 @@ noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('61afc900785dd7d071b96d9ab0af46f3'
-         'd2e7414a60eacafef45fbc4bc1a8ccb3'
-         '545d1608da2cc736be5c8bf941adbbfb'
+md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a'
+         '09153713133bddc49af99bd76129e929'
+         'c2e66522b8adf0b3fb5789e295129ba9'
          '18f577b374d60b3c760a3a3350407632'
-         '2fa6028324347860e684e75310818d43'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         'a9a1db27688bad49418667b434d29c1f'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -218,6 +221,8 @@ build() {
 		--enable-odk\
 		--enable-ext-scripting-beanshell \
 		--enable-ext-scripting-javascript \
+		--enable-ext-wiki-publisher \
+		--enable-ext-nlpsolver \
 		--disable-ext-mysql-connector \
 		--with-system-mysql \
 		--enable-librsvg=system \
@@ -246,7 +251,7 @@ build() {
 		--without-system-mozilla \
 		--without-system-mozilla-headers \
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
+		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
@@ -259,20 +264,8 @@ build() {
 		--with-java-target-version=1.5 \
 		$EXTRAOPTS
 
-#		--disable-ext-lightproof \
-
-
-#--with-install-dirname="${pkgbase}" 
-#		--enable-cairo\
-#		--with-system-libtextcat \
-#		--with-external-libtextcat-data \
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
 	touch src.downloaded
 	#./download
 	make
@@ -352,7 +345,7 @@ package_libreoffice-common() {
 }
 
 package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
  install=libreoffice-base.install
  depends=('libreoffice-common' 'hsqldb-java')
  optdepends=('libreoffice-postgresql-connector')
@@ -701,3 +694,25 @@ package_libreoffice-extension-scripting-python() {
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
 	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
 }
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+}