commit: 16d2275003f59f21a41cb37eda8ef6b29fb450a4 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Sep 22 06:35:32 2017 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Sep 22 06:35:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d22750
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 dev-libs/icu/files/icu-58.2-glibc226.patch | 16 ++++++++++++++++ dev-libs/icu/icu-58.2-r1.ebuild | 1 + dev-libs/icu/icu-59.1.ebuild | 1 + 3 files changed, 18 insertions(+) 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 index 00000000000..7003173a13f --- /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 57eae1a6805..86abec06ec3 100644 --- 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 c8f9ddca172..ed8bc1c9d95 100644 --- 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() {
