[Libreoffice-commits] core.git: external/icu

[Stephan Bergmann]

 external/icu/UnpackedTarball_icu.mk            |    1 -
 external/icu/icu4c-59-icu13329-xlocale.patch.1 |   14 --------------
 2 files changed, 15 deletions(-)

New commits:
commit f7d01f3ea5b472878255345ac6ddc113b0de9e2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 13 09:04:50 2017 +0200

    Revert "Do not include non-standardized xlocale.h, include locale.h instead"
    
    This reverts commit 274b2aee3bf65f139292d08a46d86f90d5ac8acb, which breaks in
    external/icu on macOS, <https://ci.libreoffice.org/job/lo_tb_master_mac/20605/>:
    
    > digitlst.cpp:497:8: error: unknown type name 'locale_t'
    > static locale_t gCLocale = (locale_t)0;
    >        ^

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 7fa891f07d6d..1ba15a448c75 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -35,7 +35,6 @@ $(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
deleted file mode 100644
index f57ec61e3ca6..000000000000
--- a/external/icu/icu4c-59-icu13329-xlocale.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-