git » libreoffice-still.git » commit 175e565

upgpkg: 4.3.7-3

author Andreas Radke
2015-06-07 15:33:26 UTC
committer Andreas Radke
2015-06-07 15:33:26 UTC
parent 7b6e58e4c182ffc227b18eb60443898681991b3b

upgpkg: 4.3.7-3

minor cleanups; make sure -s is stripped from Makeflags; disable avahi - solves LibO-impress  doesn't start when no avahi service running is found

PKGBUILD +7 -9

diff --git a/PKGBUILD b/PKGBUILD
index 442895e..501e09d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=4.3.7.2
 pkgver=4.3.7
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -194,16 +194,14 @@ build() {
 	# next broken test
 	[ "$CARCH" = "x86_64" ] && sed -i '/CppunitTest_macros_test/d' sw/Module_sw.mk
 
-#return 1
-	#autoconf -f
+	
+	# strip -s from Makeflags in case you use it to shorten build logs
+	_MAKEFLAGS=${MAKEFLAGS/-s/}
 
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 
 	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 		--enable-split-app-modules \
-		--with-parallelism=${MAKEFLAGS/-j/} \
+		--with-parallelism=${_MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
 		--disable-fetch-external \
 		--disable-verbose \
@@ -212,7 +210,7 @@ build() {
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
 		--enable-crashdump \
-		--enable-avahi \
+		--disable-avahi \
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
@@ -283,7 +281,7 @@ build() {
 		--with-system-clucene \
 		--disable-dependency-tracking \
 		--enable-hardlink-deliver
-
+		
 	touch src.downloaded
 	make build
 	# use this if i686 fails