diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-13 14:41:39 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 17:33:12 +0200 |
| commit | d0f44c46c678837f0b30928595d82443f3d53abe (patch) | |
| tree | 35c276aaccfb4a69f1a61ca97dbb8cb79ba31177 | |
| parent | 4602d890bf2f25b66b74bbd440397f5bbf7b3a43 (diff) | |
icu: icu4c-icu11100.patch.1 presumed obsolete
According to http://bugs.icu-project.org/trac/ticket/11100
the bug was fixed upstream in a different way so hopefully
this patch can be removed (but i don't know how to verify this).
Change-Id: I815c17dae3de2d57d2e0e247cf5823dfc1cc7109
Reviewed-on: https://gerrit.libreoffice.org/57391
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-icu11100.patch.1 | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 6800c1fb5ea8..0abba05b5bbe 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-mkdir.patch.1 \ external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \ external/icu/icu4c-ubsan.patch.1 \ - external/icu/icu4c-icu11100.patch.1 \ external/icu/icu4c-scriptrun.patch.1 \ external/icu/icu4c-rtti.patch.1 \ external/icu/icu4c-clang-cl.patch.1 \ diff --git a/external/icu/icu4c-icu11100.patch.1 b/external/icu/icu4c-icu11100.patch.1 deleted file mode 100644 index 2f0e390961c1..000000000000 --- a/external/icu/icu4c-icu11100.patch.1 +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur icu.org/source/common/ubidi.cpp icu/source/common/ubidi.cpp ---- icu.org/source/common/ubidi.cpp 2017-03-07 23:57:46.000000000 +0100 -+++ icu/source/common/ubidi.cpp 2017-04-21 22:55:11.352659142 +0200 -@@ -2125,6 +2125,14 @@ - return DirProp_ON; - } - -+static int -+isolatesavailable(UBiDi *pBiDi) { -+ if (pBiDi->isolates == pBiDi->simpleIsolates) { -+ return pBiDi->isolateCount < SIMPLE_ISOLATES_COUNT-1; -+ } -+ return pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1; -+} -+ - static void - resolveImplicitLevels(UBiDi *pBiDi, - int32_t start, int32_t limit, -@@ -2271,7 +2279,7 @@ - /* look for the last char not a BN or LRE/RLE/LRO/RLO/PDF */ - for(i=limit-1; i>start&&(DIRPROP_FLAG(dirProps[i])&MASK_BN_EXPLICIT); i--); - dirProp=dirProps[i]; -- if((dirProp==LRI || dirProp==RLI) && limit<pBiDi->length) { -+ if((dirProp==LRI || dirProp==RLI) && limit<pBiDi->length && isolatesavailable(pBiDi)) { - pBiDi->isolateCount++; - pBiDi->isolates[pBiDi->isolateCount].stateImp=stateImp; - pBiDi->isolates[pBiDi->isolateCount].state=levState.state; |