commit: 0af5d5ba7d1ef1f4fc36bfe63cf308500ec96018
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 23:21:20 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 23:21:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0af5d5ba
dev-libs/icu: Update to 58.1-r1
dev-libs/icu/Manifest | 3 +-
dev-libs/icu/files/icu-58.1-iterator.patch | 127 +++++++++++++++++++++
.../icu/{icu-58.1.ebuild => icu-58.1-r1.ebuild} | 3 +-
3 files changed, 131 insertions(+), 2 deletions(-)
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index d0519e5..4f080f1 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,5 +1,6 @@
+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
DIST icu4c-58_1-src.tgz 23366443 SHA256
0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512
59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
WHIRLPOOL
faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37
-EBUILD icu-58.1.ebuild 2961 SHA256
32124e5831dec380124df487988239001d0811d828f6c39bcdbdf61cf0b19e72 SHA512
c52671d56bc9823eda858a70f0d2a423c3d4770e4318ceb8b418aef37850f3320a947ac9be433851d8493d05d169710345ae595df533e83c99072e3e913318d4
WHIRLPOOL
e8f0d8902922f48faeb081073c420ce0640d910cbc87703c92e9bc436200ac5f83b9d063d7508bb2796e865f2cd2acc4f09820c287460396c792989b84f749d0
+EBUILD icu-58.1-r1.ebuild 3002 SHA256
e70f1ff716f340d829cf3c0b009c85b42b7e799f5ed30a1246f2a8bba4d45e1d SHA512
53f3c7e1dca7c1ee3e54af6c034d3b25f4c2b7a1c97cb1034068bb4dcd0b53dcbd570c05e4058e484d91367cfc32d7c23b87161d2c3952ac3e314747093a0c8e
WHIRLPOOL
16b4a187f7f888b1b41023d98c793131a4cffd0f6d081a4164cb33b9104c478bd29c5d3982ff36098daadff8b0c782ca4e36acb9e8d30be1c33ef791234c13c5
MISC metadata.xml 255 SHA256
34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512
ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
WHIRLPOOL
87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/dev-libs/icu/files/icu-58.1-iterator.patch
b/dev-libs/icu/files/icu-58.1-iterator.patch
new file mode 100644
index 0000000..6f52375
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.1-iterator.patch
@@ -0,0 +1,127 @@
+source: http://bugs.icu-project.org/trac/changeset/39484/
+
+
+Index: icu/common/ulist.c
+===================================================================
+--- icu/common/ulist.c (revision 39483)
++++ icu/common/ulist.c (revision 39484)
+@@ -30,5 +30,4 @@
+
+ int32_t size;
+- int32_t currentIndex;
+ };
+
+@@ -52,5 +51,4 @@
+ newList->tail = NULL;
+ newList->size = 0;
+- newList->currentIndex = -1;
+
+ return newList;
+@@ -81,6 +79,7 @@
+ p->next->previous = p->previous;
+ }
+- list->curr = NULL;
+- list->currentIndex = 0;
++ if (p == list->curr) {
++ list->curr = p->next;
++ }
+ --list->size;
+ if (p->forceDelete) {
+@@ -151,5 +150,4 @@
+ list->head->previous = newItem;
+ list->head = newItem;
+- list->currentIndex++;
+ }
+
+@@ -194,5 +192,4 @@
+ curr = list->curr;
+ list->curr = curr->next;
+- list->currentIndex++;
+
+ return curr->data;
+@@ -210,5 +207,4 @@
+ if (list != NULL) {
+ list->curr = list->head;
+- list->currentIndex = 0;
+ }
+ }
+@@ -273,3 +269,2 @@
+ return (UList *)(en->context);
+ }
+-
+Index: icu/i18n/ucol_res.cpp
+===================================================================
+--- icu/i18n/ucol_res.cpp (revision 39483)
++++ icu/i18n/ucol_res.cpp (revision 39484)
+@@ -681,4 +681,5 @@
+ }
+ memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
++ ulist_resetList(sink.values); // Initialize the iterator.
+ en->context = sink.values;
+ sink.values = NULL; // Avoid deletion in the sink destructor.
+Index: icu/test/intltest/apicoll.cpp
+===================================================================
+--- icu/test/intltest/apicoll.cpp (revision 39483)
++++ icu/test/intltest/apicoll.cpp (revision 39484)
+@@ -82,14 +82,7 @@
+ col = Collator::createInstance(Locale::getEnglish(), success);
+ if (U_FAILURE(success)){
+- errcheckln(success, "Default Collator creation failed. - %s",
u_errorName(success));
+- return;
+- }
+-
+- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("",
Locale::getEnglish(),true,success);
+- if (U_FAILURE(success)){
+- errcheckln(success, "Get Keyword Values for Locale failed. - %s",
u_errorName(success));
+- return;
+- }
+- delete kwEnum;
++ errcheckln(success, "English Collator creation failed. - %s",
u_errorName(success));
++ return;
++ }
+
+ col->getVersion(versionArray);
+@@ -230,4 +223,27 @@
+ delete aFrCol;
+ delete junk;
++}
++
++void CollationAPITest::TestKeywordValues() {
++ IcuTestErrorCode errorCode(*this, "TestKeywordValues");
++ LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(),
errorCode));
++ if (errorCode.logIfFailureAndReset("English Collator creation failed")) {
++ return;
++ }
++
++ LocalPointer<StringEnumeration> kwEnum(
++ col->getKeywordValuesForLocale("collation", Locale::getEnglish(),
TRUE, errorCode));
++ if (errorCode.logIfFailureAndReset("Get Keyword Values for English
Collator failed")) {
++ return;
++ }
++ assertTrue("expect at least one collation tailoring for English",
kwEnum->count(errorCode) > 0);
++ const char *kw;
++ UBool hasStandard = FALSE;
++ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
++ if (strcmp(kw, "standard") == 0) {
++ hasStandard = TRUE;
++ }
++ }
++ assertTrue("expect at least the 'standard' collation tailoring for
English", hasStandard);
+ }
+
+@@ -2467,4 +2483,5 @@
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestProperty);
++ TESTCASE_AUTO(TestKeywordValues);
+ TESTCASE_AUTO(TestOperators);
+ TESTCASE_AUTO(TestDuplicate);
+Index: icu/test/intltest/apicoll.h
+===================================================================
+--- icu/test/intltest/apicoll.h (revision 39483)
++++ icu/test/intltest/apicoll.h (revision 39484)
+@@ -36,4 +36,5 @@
+ */
+ void TestProperty(/* char* par */);
++ void TestKeywordValues();
+
+ /**
diff --git a/dev-libs/icu/icu-58.1.ebuild b/dev-libs/icu/icu-58.1-r1.ebuild
similarity index 98%
rename from dev-libs/icu/icu-58.1.ebuild
rename to dev-libs/icu/icu-58.1-r1.ebuild
index efa3bab..a70da9f 100644
--- a/dev-libs/icu/icu-58.1.ebuild
+++ b/dev-libs/icu/icu-58.1-r1.ebuild
@@ -32,6 +32,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"
)
@@ -82,9 +83,9 @@ src_configure() {
multilib_src_configure() {
local myeconfargs=(
- --disable-layoutex
--disable-renaming
--disable-samples
+ --disable-layoutex
$(use_enable debug)
$(use_enable static-libs static)
)
