diff options
| author | Eike Rathke <erack@redhat.com> | 2018-07-16 15:20:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-16 17:36:35 +0200 |
| commit | 86dfa34c6d83b70923d462fecad316dafd9a1fc4 (patch) | |
| tree | e9b9849ac02b63e110733effe6927a13cb35c6fb /external/icu | |
| parent | f543b6a0ac6cf30922c1a1ae9bfce1d605f1d4f1 (diff) | |
Upgrade to ICU 62.1
Change-Id: I9426e77aa85cfe068df59db47b8ac50b59cd4eb3
Reviewed-on: https://gerrit.libreoffice.org/57500
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'external/icu')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-mkdir.patch.1 | 6 | ||||
| -rw-r--r-- | external/icu/ofz4860.patch.2 | 25 |
3 files changed, 3 insertions, 29 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index c789e6eb8d84..6800c1fb5ea8 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -34,7 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-clang-cl.patch.1 \ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ external/icu/icu4c-khmerbreakengine.patch.1 \ - external/icu/ofz4860.patch.2 \ external/icu/icu4c-61-werror-shadow.patch.1 \ )) diff --git a/external/icu/icu4c-mkdir.patch.1 b/external/icu/icu4c-mkdir.patch.1 index 3234f151b677..7de4cf51174c 100644 --- a/external/icu/icu4c-mkdir.patch.1 +++ b/external/icu/icu4c-mkdir.patch.1 @@ -1,10 +1,10 @@ diff -ur icu.org/source/data/Makefile.in icu/source/data/Makefile.in ---- icu.org/source/data/Makefile.in 2016-06-15 20:58:17.000000000 +0200 -+++ icu/source/data/Makefile.in 2017-04-21 22:29:00.747158002 +0200 +--- icu.org/source/data/Makefile.in 2018-06-21 11:39:15.000000000 +0200 ++++ icu/source/data/Makefile.in 2018-07-16 13:18:26.928109541 +0200 @@ -367,6 +367,7 @@ ifeq ($(PKGDATA_MODE),dll) SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res - $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc + $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | build-dir + mkdir -p $(OUTTMPDIR) ifeq ($(MSYS_RC_MODE),1) rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $< diff --git a/external/icu/ofz4860.patch.2 b/external/icu/ofz4860.patch.2 deleted file mode 100644 index 14114d52878b..000000000000 --- a/external/icu/ofz4860.patch.2 +++ /dev/null @@ -1,25 +0,0 @@ -From 529ba01ee606940ca273b187be8ce9ba31cf2d90 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Fri, 19 Jan 2018 10:41:02 +0100 -Subject: [PATCH] ofz#4860 fix past-the-end read from array - ---- - icu4c/source/common/locmap.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp -index cbb2b810a..6d62d8310 100644 ---- a/icu4c/source/common/locmap.cpp -+++ b/icu4c/source/common/locmap.cpp -@@ -1015,7 +1015,7 @@ static const char* - getPosixID(const ILcidPosixMap *this_0, uint32_t hostID) - { - uint32_t i; -- for (i = 0; i <= this_0->numRegions; i++) -+ for (i = 0; i < this_0->numRegions; i++) - { - if (this_0->regionMaps[i].hostID == hostID) - { --- -2.14.3 - |