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

[Evangelos Foutras]

    Date: Monday, November 13, 2017 @ 00:08:00
  Author: foutrelis
Revision: 309692

Patch bundled ICU to not include xlocale.h

Modified:
  libreoffice-still/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-13 00:07:49 UTC (rev 309691)
+++ PKGBUILD	2017-11-13 00:08:00 UTC (rev 309692)
@@ -259,12 +259,12 @@
 
 	touch src.downloaded
 
-	# many tests are broken when crossbuilding i686
-	if [ "$CARCH" = "x86_64" ]; then
-	   make build
-	else
-	   make build-nocheck
-	fi
+	make build || {
+		# https://ssl.icu-project.org/trac/ticket/13329
+		sed -i 's/xlocale/locale/' \
+			workdir/UnpackedTarball/icu/source/i18n/digitlst.cpp
+		make build
+	}
 
 	mkdir ${srcdir}/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install