Tue Jun 17 03:23:47 UTC 2014

1 files changed, 66 insertions, 64 deletions

diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index 7319ff8bf..bf25df390 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 213923 2014-05-31 15:05:40Z bpiotrowski $
+# $Id: PKGBUILD 215151 2014-06-14 19:16:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=4.3.0.0.beta1
+_LOver=4.3.0.0.beta2-buildfix1
 pkgver=4.3.0
-pkgrel=0.7
+pkgrel=0.8
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -20,7 +20,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'lib
 	'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
 	'junit' 'libmythes' 'libwpg'  'mesa' 'java-environment' 'postgresql-libs'
 	'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
-	'apr' 'serf' 'chrpath' 'ttf-liberation')
+	'apr' 'serf' 'chrpath' 'ttf-liberation'
+	'valgrind')
 
 #_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
@@ -54,15 +55,15 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+	${_additional_source_url}/libmwaw-0.3.1.tar.bz2
+	${_additional_source_url}/libfreehand-0.1.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
-	${_additional_source_url}/libe-book-0.0.3.tar.bz2
-	${_additional_source_url}/libabw-0.0.2.tar.bz2
-	${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
+	${_additional_source_url}/libe-book-0.1.1.tar.bz2
+	${_additional_source_url}/libabw-0.1.0.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
 	${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
 	${_additional_source_url}/CoinMP-1.7.6.tgz
-	# do not use system glm, LibO patxhes it!
+	# do not use system glm, LibO patches it!
 	${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
@@ -97,18 +98,66 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libmwaw-0.2.0.tar.bz2
-	libfreehand-0.0.0.tar.bz2
+	libmwaw-0.3.1.tar.bz2
+	libfreehand-0.1.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
-	libe-book-0.0.3.tar.bz2
-	libabw-0.0.2.tar.bz2
-	language-subtag-registry-2014-03-27.tar.bz2
+	libe-book-0.1.1.tar.bz2
+	libabw-0.1.0.tar.bz2
+	language-subtag-registry-2014-04-10.tar.bz2
 	8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
 	CoinMP-1.7.6.tgz
 	bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	collada2gltf-master-6258611a6a.tar.bz2
 	OpenCOLLADA-master-6509aa13af.tar.bz2
 	510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
+md5sums=('d4dc0ed333569336519dfbddcbb1b329'
+         'SKIP'
+         'b009798fa57feea21924cdc6a4a6212a'
+         'SKIP'
+         '4c502724049b9dd50eaee81ec7b1896b'
+         'SKIP'
+         'd6eef4b4cacb2183f2bf265a5a03a354'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'a7983f859eafb2677d7ff386a023bc40'
+         'e8e197d628436490886d17cffa108fe3'
+         '8ab049135b2d15313da5d9f0656894a1'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         '048751f3271906db5126ab76870444c4'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         'ae330b9493bd4503ac390106ff6060d7'
+         '22f8a85daf4a012180322e1f52a7563b'
+         '7681383be6ce489d84c1c74f4e7f9643'
+         '36271d3fa0d9dec1632029b6d7aac925'
+         '0168229624cfac409e766913506961a8'
+         '17410483b5b5f267aa18b7e00b65e6e0'
+         '185d60944ea767075d27247c3162b3bc'
+         '6f1ac4a0e24131c422e1e91f07718fb6'
+         '5f029fef73e42a2c2ae4524a7513f97d'
+         '21154d2004e025c8a3666625b0357bb5'
+         'c25a881d21abc5b4da19205db513cc22'
+         '9317e967c8fa8ff50e049744c4b33c87'
+         '49c94710f7858b1969d74ff72e6aac84'
+         '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+         '1cce53bf4b40ae29790d2c5c9f8b1129'
+         'bae83fa5dc7f081768daace6e199adc3'
+         'c8a8be5829ceffacfe1d68d078f5c442'
+         '4ca8a6ef0afeefc864e9ef21b9f14bd6'
+         '510c3f8504bfb8cc8c8fc5d0fac74055'
+         '07d2bf5ad839a394cca008b3ec6e7bb1'
+         '4195735a80876ae812fca5736b50192a'
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
 prepare() {
 	cd libreoffice-$_LOver
@@ -232,6 +281,8 @@ build() {
 
 	touch src.downloaded
 	make
+	# use this if i686 fails
+	#make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck
 
 	mkdir ${srcdir}/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -353,52 +404,3 @@ package_libreoffice-fresh() {
 	chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
 	chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
 }
-
-md5sums=('c98ff0989252558dc21b71ec5e32049f'
-         'SKIP'
-         '5b3b55d75a9659dace93900c3e88d6a9'
-         'SKIP'
-         '507657907ee417631287c79deb44cfc8'
-         'SKIP'
-         'd6eef4b4cacb2183f2bf265a5a03a354'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'a7983f859eafb2677d7ff386a023bc40'
-         'e8e197d628436490886d17cffa108fe3'
-         '8ab049135b2d15313da5d9f0656894a1'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '048751f3271906db5126ab76870444c4'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         'ae330b9493bd4503ac390106ff6060d7'
-         '22f8a85daf4a012180322e1f52a7563b'
-         '7681383be6ce489d84c1c74f4e7f9643'
-         '36271d3fa0d9dec1632029b6d7aac925'
-         '0168229624cfac409e766913506961a8'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '185d60944ea767075d27247c3162b3bc'
-         'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '496dd00028afcc19f896b01394769043'
-         '21154d2004e025c8a3666625b0357bb5'
-         '2f1ceaf2ac8752ed278e175447d9b978'
-         '40fa48e03b1e28ae0325cc34b35bc46d'
-         '504af523f5d1a5590bbeb6a4b55e8a97'
-         '8ac8ae9829c4fefd1ae9f715f95d4e0b'
-         '1cce53bf4b40ae29790d2c5c9f8b1129'
-         'bae83fa5dc7f081768daace6e199adc3'
-         'c8a8be5829ceffacfe1d68d078f5c442'
-         '4ca8a6ef0afeefc864e9ef21b9f14bd6'
-         '510c3f8504bfb8cc8c8fc5d0fac74055'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')