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

[Andreas Radke]

    Date: Thursday, August 4, 2016 @ 15:07:06
  Author: andyrtr
Revision: 273029

upgpkg: libreoffice-fresh 5.2.0-2

poppler rebuild

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-04 15:00:16 UTC (rev 273028)
+++ PKGBUILD	2016-08-04 15:07:06 UTC (rev 273029)
@@ -13,7 +13,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=5.2.0.4
 pkgver=5.2.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -144,6 +144,9 @@
 	# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478
 	patch -Np1 -i ../buildfix.diff
 
+	# don't run broken tests on i686
+	[ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk
+	
 	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
 	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -159,13 +162,6 @@
 		esac
 		ARCH_FLAGS="$ARCH_FLAGS $i"
 	done
-
-	
-	# i686 build broken
-#	[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
-	[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk
-#	[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
-
 }
 
 build() {