diff options
| author | Eike Rathke <erack@redhat.com> | 2017-09-12 22:14:07 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-09-13 01:54:45 +0200 |
| commit | 274b2aee3bf65f139292d08a46d86f90d5ac8acb (patch) | |
| tree | 9ae41db115761cf5eea9fe2e5b091a9f437109d3 | |
| parent | a0f51dc3a480715a868aa024f6d17d6f2e78d0bf (diff) | |
Do not include non-standardized xlocale.h, include locale.h instead
"The file and this data structure is not standardized. Don't rely on it. It
can go away without warning."
...
And since glibc 2.26 it's gone.
https://ssl.icu-project.org/trac/ticket/13329
Change-Id: Iaf595b9c1be4eaab4306acb2c63c5a13dcb7a4e3
Reviewed-on: https://gerrit.libreoffice.org/42219
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-59-icu13329-xlocale.patch.1 | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 1ba15a448c75..7fa891f07d6d 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -35,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-59-werror-undef.patch.1 \ external/icu/icu4c-59-werror-shadow.patch.1 \ external/icu/icu4c-iOS.patch.1 \ + external/icu/icu4c-59-icu13329-xlocale.patch.1 \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 b/external/icu/icu4c-59-icu13329-xlocale.patch.1 new file mode 100644 index 000000000000..f57ec61e3ca6 --- /dev/null +++ b/external/icu/icu4c-59-icu13329-xlocale.patch.1 @@ -0,0 +1,14 @@ +# xlocale.h is gone with glibc 2.26 and should never had been included. +# https://ssl.icu-project.org/trac/ticket/13329 +diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp +--- icu.org/source/i18n/digitlst.cpp 2017-01-20 01:20:31.000000000 +0100 ++++ icu/source/i18n/digitlst.cpp 2017-09-12 22:03:15.019034749 +0200 +@@ -64,7 +64,7 @@ + # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN + # include <locale.h> + # else +-# include <xlocale.h> ++# include <locale.h> + # endif + #endif + |