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

[Evangelos Foutras]

    Date: Monday, November 13, 2017 @ 00:07:49
  Author: foutrelis
Revision: 309691

Patch bundled ICU to not include xlocale.h

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-11-12 22:51:43 UTC (rev 309690)
+++ PKGBUILD    2017-11-13 00:07:49 UTC (rev 309691)
@@ -259,10 +259,14 @@
                --disable-dependency-tracking
 
        touch src.downloaded
-       
-       # many tests are broken when crossbuilding i686
-        make build
 
+       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
 }