summaryrefslogtreecommitdiff
path: root/external/icu/UnpackedTarball_icu.mk
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2017-04-24 10:55:47 +0200
committerAndras Timar <andras.timar@collabora.com>2017-04-24 11:01:41 +0200
commitb799279088353b38117171ea212c73af6ccae648 (patch)
tree3c68275c6b5a2dc9224a8832cb3da8ad9758a1ec /external/icu/UnpackedTarball_icu.mk
parentaa89161fc713a365bbec2936331f4f342d6eb58d (diff)
Revert back to ICU 54, because MSP cannot be generated on Windows
Change-Id: Ie0c857c9c8fd7091e115245c75d7490d46033426
Diffstat (limited to 'external/icu/UnpackedTarball_icu.mk')
-rw-r--r--external/icu/UnpackedTarball_icu.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 86369ef8e43b..09342893fc8c 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -23,14 +23,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu-ubsan.patch.0 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch \
+ external/icu/icu4c-icu11451.patch.1 \
external/icu/rtti.patch.0 \
- external/icu/clang-cl.patch.0 \
+ external/icu/icu.changeset_36724.patch.1 \
+ external/icu/icu.changeset_36727.patch.1 \
+ external/icu/icu.changeset_36801.patch.1 \
$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
- $(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
- external/icu/khmerbreakengine.patch \
- external/icu/icu4c-changeset-39671.patch.1 \
))
-$(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
-
# vim: set noet sw=4 ts=4: