Tue Jan 31 23:14:56 UTC 2012

2 files changed, 49 insertions, 54 deletions

diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index ab256b844..5e912ef26 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146343 2012-01-09 18:52:36Z stephane $
+# $Id: PKGBUILD 148213 2012-01-30 18:48:25Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -35,9 +35,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.4.2
-pkgver=3.4.4
-pkgrel=5
+_LOver=3.4.5.2
+pkgver=3.4.5
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -61,8 +61,11 @@ makedepends=( # makedepends
 
 _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
+_additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.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
@@ -102,11 +105,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_boost.diff
 	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
-	gcc462_buildfix.diff)
+	scp2-more-reasonable-file-access-rights.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -142,25 +143,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
-         'db423cbb1cee416b718138044a5de930'
-         '31944d2139d6d81ef1131bd513530621'
-         'f447fd4ffe54aab9561c6caa262754b3'
-         '97fe698737a35c8803712d4e08007620'
-         'acff44d97a5106d9b53c747dabeb0800'
-         '620d43a0b9f36388f423e030513864ef'
-         '4c5b1ed870363eca2602f0cb42a8415a'
-         '702c6ca31525d7d2c2ded86c77b0bd2e'
-         'ac9b3acf78f43c1395d0e2dedc860f30'
-         'd8d2c41cb86bc8ba2a07e001a5317abb'
-         '4d4af2fc06dbe33ec2307df812f7abe1'
-         '1398a566eb76598bf3005e187fc2386c'
-         'dd962d2d57f88b9e07e665adad3cabbc'
-         'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
-         'e54d41d39e63d04ac4a88ce79e37af98'
-         'dbc71403040f447683bf55d1f0be3cad'
-         '69ce5b72f44b008d0e78767c5b1dbf39'
-         '34a2e8ae6b81a042966740263c53e135'
+md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
+         'c1e2dabdf4cfcd5957779014a7f9787e'
+         '79c9c7fc208e7f56af09f284f261a7da'
+         'c83a8a374d3d5cc83c6ac3b5ff613e46'
+         'fa64799ebad8cbd2c160ac2f87bd5599'
+         'b24fba57aa4185934e86a0a8db4a3433'
+         '4f98020088ab9b597fc21b617121bd47'
+         '3c3be7c5f923339c90b0d1d6ecad0243'
+         '3a0bb4bb096b7488533ed2ee466a2bc9'
+         'f2b180aa1eff3884b4ca81c048f1e327'
+         'a9af488ef92ad4442eafba874249c529'
+         'db6a67c96a9090bc5e21b64e202a984e'
+         'e00187ae0840e1f6a00fa3290cacf0d1'
+         '20fbf6cffd2b06e90a52105b75a57828'
+         '4af055f590732ec19a2534b2278ac49c'
+         'c84693796d2b1d9c8269425b1fa53aef'
+         'd4926dc27b6884656feec6753f4fdf22'
+         '770678ca19cca0f7985c1c82b2dccf48'
+         '97a1e3de430b124faf35bf334248ad53'
+         'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -200,10 +202,7 @@ md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '3c6c62e77c30649a3dfe73512947cc9a'
-         'eb35d4c715e0dfc23bbc706996033829'
-         '10600d04ee81014bc9b5cc04e615d799')
+         '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
 
@@ -233,10 +232,6 @@ build() {
 	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
-	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
-	patch -Np1 -i ${srcdir}/gcc462_buildfix.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -290,7 +285,6 @@ build() {
 		--enable-lockdown\
 		--enable-opengl \
 		--enable-odk\
-		--enable-opengl\
 		--enable-ext-barcode \
 		--enable-ext-diagram \
 		--enable-ext-google-docs \
@@ -333,7 +327,7 @@ build() {
 		--with-external-libtextcat-data \
 		--with-openldap\
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
+		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mozilla\
diff --git a/testing/libreoffice/PKGBUILD.next_stable b/testing/libreoffice/PKGBUILD.next_stable
index a25819863..a8cb4c5ad 100644
--- a/testing/libreoffice/PKGBUILD.next_stable
+++ b/testing/libreoffice/PKGBUILD.next_stable
@@ -18,9 +18,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
-_LOver=3.4.99.2
-pkgver=3.5.0beta2
-pkgrel=2
+_LOver=3.4.99.3
+pkgver=3.5.0beta3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -44,7 +44,8 @@ makedepends=( # makedepends
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.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
@@ -73,8 +74,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
-	fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f)
-noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
+noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
+	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
@@ -103,10 +105,11 @@ noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 #	cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 )
-md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69'
-         '31471ad86996629a8c20f3a4d24ee03e'
-         '3146b8522605d24ce4a259fe73ec3519'
-         'a8b25a0bf696fd126a08319d88998492'
+md5sums=('3f223ec797a100e557f7138c8ab4a91b'
+         'bb08c856e5c9a7a8bcf22fefdb7cf13f'
+         '83bd4be3370840de3e535b2c974e8af5'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '053a35c244bf132f806e198ac4d960aa'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -134,7 +137,7 @@ md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69'
          '7c2549f6b0a8bb604e6c4c729ffdcfe6'
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
-         'f9bd737527dafd3eeb451cf0dd95d7d6')
+         '661a52a02a31b3afbe4b3b3146061afd')
 
 build() {
 
@@ -157,8 +160,8 @@ build() {
 	# buildfixes & bugfixes
 	# one late fix to solve make distro-pack-install issue
 	patch -Np1 -i ${srcdir}/gmake_install.diff
-	patch -Np1 -i ${srcdir}/fix_menuicons.diff
-
+	patch -Np1 -i ${srcdir}/smp_buildfix.diff
+	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -180,7 +183,7 @@ build() {
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
 	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-	touch autogen.lastrun
+#	touch autogen.lastrun
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
@@ -232,7 +235,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\
@@ -258,8 +261,6 @@ build() {
 
 	touch src.downloaded
 	#./download
-#	unset MAKEFLAGS
-#	./bootstrap
 	make
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall