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

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Jan 16 19:04:05 UTC 2012


    Date: Monday, January 16, 2012 @ 14:04:05
  Author: andyrtr
Revision: 146695

prepare LibO 3.5 branch release  - beta3, use internal boost, system one breaks build with an internal error

Modified:
  libreoffice/trunk/PKGBUILD.next_stable

----------------------+
 PKGBUILD.next_stable |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD.next_stable
===================================================================
--- PKGBUILD.next_stable	2012-01-16 14:00:07 UTC (rev 146694)
+++ PKGBUILD.next_stable	2012-01-16 19:04:05 UTC (rev 146695)
@@ -18,9 +18,9 @@
 	'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 @@
 _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 @@
 	#${_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 @@
 	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 @@
          '7c2549f6b0a8bb604e6c4c729ffdcfe6'
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
-         'f9bd737527dafd3eeb451cf0dd95d7d6')
+         '661a52a02a31b3afbe4b3b3146061afd')
 
 build() {
 
@@ -157,8 +160,8 @@
 	# 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 @@
 	# 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 @@
 		--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 @@
 
 	touch src.downloaded
 	#./download
-#	unset MAKEFLAGS
-#	./bootstrap
 	make
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall




More information about the arch-commits mailing list