dev-libs/icu: Fix build with glibc-2.26, bug 628750

Closes: https://bugs.gentoo.org/628750
Package-Manager: Portage-2.3.10, Repoman-2.3.3

diff --git a/dev-libs/icu/files/icu-58.2-glibc226.patch b/dev-libs/icu/files/icu-58.2-glibc226.patch
new file mode 100644 (file)
index 0000000..7003173
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-glibc226.patch
@@ -0,0 +1,16 @@
+diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp
+--- a/i18n/digitlst.cpp        2016-10-27 01:37:56.000000000 -0000
++++ b/i18n/digitlst.cpp        2017-09-21 20:39:29.873030393 -0000
+@@ -61,11 +61,7 @@
+ #endif
+ 
+ #if U_USE_STRTOD_L
+-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+-#   include <locale.h>
+-# else
+-#   include <xlocale.h>
+-# endif
++# include <locale.h>
+ #endif
+ 
+ // ***************************************************************************

diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 57eae1a6805d1af7a416d4cc763596e0d5ff8ebd..86abec06ec357fe896d04a5cc7949df49d6c3392 100644 (file)
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
        "${FILESDIR}/${PN}-58.1-iterator.patch"
        "${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch"
+       "${FILESDIR}/${PN}-58.2-glibc226.patch"
 )
 
 pkg_pretend() {

diff --git a/dev-libs/icu/icu-59.1.ebuild b/dev-libs/icu/icu-59.1.ebuild
index c8f9ddca17279fff5797602ec832a4a46cfb18cc..ed8bc1c9d952fdf97d97422953d61db53e53838f 100644 (file)
--- a/dev-libs/icu/icu-59.1.ebuild
+++ b/dev-libs/icu/icu-59.1.ebuild
@@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
        "${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+       "${FILESDIR}/${PN}-58.2-glibc226.patch"
 )
 
 pkg_pretend() {