diff options
| author | Eike Rathke <erack@redhat.com> | 2016-04-13 22:24:25 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 22:01:09 +0200 |
| commit | 0a6ff6a3d24f29b045bfecc39d78b7c7a8af389d (patch) | |
| tree | b15e891762cb9b751e433ec6a85fa18c7726f2e0 | |
| parent | 042586d8986429751c4c60e7bdab6efcd1dba483 (diff) | |
upgrade to ICU 57
This does not apply patches
external/icu/khmerbreakengine.patch
external/icu/khmerdict.dict
anymore, as the khmerbreakengine.patch failed to apply with several
hunks of which one was 16k. Asking the patch contributor to follow-up on
this.
Change-Id: I78d4371d04a7b03417d402a222bcd384f02a619e
Reviewed-on: https://gerrit.libreoffice.org/24067
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c58655c5a221d986fa3c3eed2f28810269205721)
(cherry picked from commit 05d9fd7b3416ef24e94973c1bdef458636ccaf7f)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index fdaaf4b57381..0e1a0533470b 100644 --- a/configure.ac +++ b/configure.ac @@ -8935,7 +8935,7 @@ SYSTEM_GENBRK= SYSTEM_GENCCODE= SYSTEM_GENCMN= -ICU_MAJOR=56 +ICU_MAJOR=57 ICU_MINOR=1 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE" ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE" diff --git a/download.lst b/download.lst index 21f2b25845e3..c993c7e81f6e 100644 --- a/download.lst +++ b/download.lst @@ -58,7 +58,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz -export ICU_TARBALL := c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz +export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 4a6a11477af3..c48d02556d2d 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -27,9 +27,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/clang-cl.patch.0 \ $(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 \ )) -$(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) - # vim: set noet sw=4 ts=4: |