external/icu/UnpackedTarball_icu.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 89de6f62ae1e96d2c492cb5cd8f7d313b51e2f98
Author: Eike Rathke <er...@redhat.com>
Date: Wed Apr 26 20:08:42 2017 +0200
Upgrade to ICU 59.1 follow-up: only add icu/source/data/misc/icudata.rc
... instead of the entire icu4c-59_1-data.zip content.
Change-Id: Icfbf7d4103059f525b303b194212b78935fb00b1
Reviewed-on: https://gerrit.libreoffice.org/37001
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 992001186d5f..1047fdebfeaf 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -12,11 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
$(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
# Data zip contains data/... and needs to end up in icu/source/data/...
-# Some files are overwritten with identical content.
-# -a to convert line endings from CrLf to LF (hopefully no binary identified as
-# text ...) so existing patches still apply and can be generated.
+# Only data/misc/icudata.rc is needed for a Cygwin/MSVC build.
$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
- unzip -q -a -d source -o
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_DATA_TARBALL) \
+ unzip -q -d source -o
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_DATA_TARBALL) data/misc/icudata.rc \
))
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
