commit: 967de52be6fad1d03b0e31bd39409b886244a90a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec 20 21:42:48 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Dec 20 21:42:48 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=967de52b
dev-libs/icu: Fix patch
dev-libs/icu/Manifest | 3 ++-
dev-libs/icu/files/icu-58.2-no-xlocale.patch | 16 ++++++++++++++++
dev-libs/icu/icu-58.2.ebuild | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 1c248fb..11227ba 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,8 +1,9 @@
AUX icu-58.1-iterator.patch 4097 SHA256
468bba2185584c30a5b096d7c85d0afa739067594f0883b6f8f448b1bf996801 SHA512
46c51629fb5ff14cdfcbc355bff6cceb7132fc79176ec7fcf76bd9ac8553fccbf6528508753b73a0a4301721260ad60a359bf56c66e3bd0151415a4a226ff21c
WHIRLPOOL
4268216dad6ed8a2ce3e00cb1a9d7e7a8bcb2922ce1f02b5f50d07632a843d1bb8e1dea9710acff1cbc943a41940c22fc453faafe39fa3bb8bad068d0ca01588
AUX icu-58.1-no-xlocale.patch 493 SHA256
31fa67910ebb691f70d1edfc685a5cd735f0df2cced92f3a9ccdc79ae172883f SHA512
e56576c527049f1fd32185e32b5bbc23d2c861fb1da8491a6f957c8b2919637a795a36e9616bd433bc8aed2e78c06be6108162640838644194e7a79448b72701
WHIRLPOOL
ec0eb13c54b6e58469d0095a34f58d8689344215175b4e850be459e99f9c3c1209e4e913e3185e9666436f1d668d1d6d8acdb38c5bbba36fbb04ddf2443e686c
AUX icu-58.1-remove-bashisms.patch 5888 SHA256
8a2177d5f549168d5680d6477381a9f6f5ca0bd8f6bd23cc30d7f953e10907bc SHA512
54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
WHIRLPOOL
8f0d95fe666a3de52ebf4511b0792add819e4dbf3e5e259e2f80bd1fce28e21bd046084a18c3130dc16ad1bc3c73cb912c8bb1d0d8bb387b0587d8748c656824
+AUX icu-58.2-no-xlocale.patch 510 SHA256
60747713fb8ef63b03bf43914376295bd65c0a991c3e3c1bf39577facb26df94 SHA512
ac0c6c1e0f7d0744cc867ec8ee0cf25288f5c9679a92609b50b0f2e12287bade725b2e730e806a56e40c04d73621fa0ad18770c6210aa62d574fa6f29cd6a269
WHIRLPOOL
47d96e79e8d0f26d3dd1eb171c30f5adaae22d782ba46cd216cc1aa759b463b5a98a0df036727f6bc9302ba7e740191bd1bf51b6d00cb0ea6b79333ed9cdebec
DIST icu4c-58_1-src.tgz 23366443 SHA256
0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512
59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
WHIRLPOOL
faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37
DIST icu4c-58_2-src.tgz 23369902 SHA256
2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512
5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
WHIRLPOOL
25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a
EBUILD icu-58.1-r1.ebuild 2995 SHA256
59fee71afba6047825cd515fa809c9f243fba862b93025b270ed1651ab4b26a6 SHA512
5e87466528ee0ad1789e94a9004163525b10e92ed21413c79ce07a1c965f5786dffd571fb5829df83039de346c7df8cfa38b2c7e071c23f592a8282841b67708
WHIRLPOOL
4c4ced486a67dca79355730e4eb2c3f697d4e7b4ea23be0f0c40a24b2457d01022df82c9f12881755ea6d144631ff0217b4ccf24863ecabd40738d3e953d649a
-EBUILD icu-58.2.ebuild 3002 SHA256
e70f1ff716f340d829cf3c0b009c85b42b7e799f5ed30a1246f2a8bba4d45e1d SHA512
53f3c7e1dca7c1ee3e54af6c034d3b25f4c2b7a1c97cb1034068bb4dcd0b53dcbd570c05e4058e484d91367cfc32d7c23b87161d2c3952ac3e314747093a0c8e
WHIRLPOOL
16b4a187f7f888b1b41023d98c793131a4cffd0f6d081a4164cb33b9104c478bd29c5d3982ff36098daadff8b0c782ca4e36acb9e8d30be1c33ef791234c13c5
+EBUILD icu-58.2.ebuild 3002 SHA256
46d635320ce0e39cce0ddd735d5a10e98c583823dd41818891adf4962150432b SHA512
76cfb0e4f20e6161923e52fe9703ef5cccbe0b4145a86778711eddfd8960329c81ecc7c23a846af66b9d8248293e083ba4a9db7daeefb5bca06856378e963f75
WHIRLPOOL
e14f86525233ed6053808ba68d17a730d77dc67cc686de26717332e4600cb456347f7a8695aef940028ce349cb96d96f52a2ef8b1506ce51140f64cd771a56f8
MISC metadata.xml 255 SHA256
34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512
ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
WHIRLPOOL
87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/dev-libs/icu/files/icu-58.2-no-xlocale.patch
b/dev-libs/icu/files/icu-58.2-no-xlocale.patch
new file mode 100644
index 0000000..a90290d
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-no-xlocale.patch
@@ -0,0 +1,16 @@
+diff -Naur icu.orig/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.orig/source/i18n/digitlst.cpp 2016-10-26 18:37:56.000000000 -0700
++++ icu/source/i18n/digitlst.cpp 2016-12-20 13:41:27.124353535 -0800
+@@ -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.ebuild b/dev-libs/icu/icu-58.2.ebuild
index a70da9f..86c8276 100644
--- a/dev-libs/icu/icu-58.2.ebuild
+++ b/dev-libs/icu/icu-58.2.ebuild
@@ -33,7 +33,7 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
"${FILESDIR}/${PN}-58.1-iterator.patch"
- "${FILESDIR}/${PN}-58.1-no-xlocale.patch"
+ "${FILESDIR}/${PN}-58.2-no-xlocale.patch"
)
src_prepare() {
