Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/, dev-libs/icu/files/
Date: Fri, 22 Sep 2017 06:36:20
Message-Id: 1506062155.16d2275003f59f21a41cb37eda8ef6b29fb450a4.dilfridge@gentoo
1 commit: 16d2275003f59f21a41cb37eda8ef6b29fb450a4
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 22 06:35:32 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 22 06:35:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d22750
7
8 dev-libs/icu: Fix build with glibc-2.26, bug 628750
9
10 Closes: https://bugs.gentoo.org/628750
11 Package-Manager: Portage-2.3.10, Repoman-2.3.3
12
13 dev-libs/icu/files/icu-58.2-glibc226.patch | 16 ++++++++++++++++
14 dev-libs/icu/icu-58.2-r1.ebuild | 1 +
15 dev-libs/icu/icu-59.1.ebuild | 1 +
16 3 files changed, 18 insertions(+)
17
18 diff --git a/dev-libs/icu/files/icu-58.2-glibc226.patch b/dev-libs/icu/files/icu-58.2-glibc226.patch
19 new file mode 100644
20 index 00000000000..7003173a13f
21 --- /dev/null
22 +++ b/dev-libs/icu/files/icu-58.2-glibc226.patch
23 @@ -0,0 +1,16 @@
24 +diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp
25 +--- a/i18n/digitlst.cpp 2016-10-27 01:37:56.000000000 -0000
26 ++++ b/i18n/digitlst.cpp 2017-09-21 20:39:29.873030393 -0000
27 +@@ -61,11 +61,7 @@
28 + #endif
29 +
30 + #if U_USE_STRTOD_L
31 +-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
32 +-# include <locale.h>
33 +-# else
34 +-# include <xlocale.h>
35 +-# endif
36 ++# include <locale.h>
37 + #endif
38 +
39 + // ***************************************************************************
40
41 diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
42 index 57eae1a6805..86abec06ec3 100644
43 --- a/dev-libs/icu/icu-58.2-r1.ebuild
44 +++ b/dev-libs/icu/icu-58.2-r1.ebuild
45 @@ -33,6 +33,7 @@ PATCHES=(
46 "${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
47 "${FILESDIR}/${PN}-58.1-iterator.patch"
48 "${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch"
49 + "${FILESDIR}/${PN}-58.2-glibc226.patch"
50 )
51
52 pkg_pretend() {
53
54 diff --git a/dev-libs/icu/icu-59.1.ebuild b/dev-libs/icu/icu-59.1.ebuild
55 index c8f9ddca172..ed8bc1c9d95 100644
56 --- a/dev-libs/icu/icu-59.1.ebuild
57 +++ b/dev-libs/icu/icu-59.1.ebuild
58 @@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=(
59
60 PATCHES=(
61 "${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
62 + "${FILESDIR}/${PN}-58.2-glibc226.patch"
63 )
64
65 pkg_pretend() {