[Midnightbsd-cvs] mports [23167] trunk/devel/icu: icu 58.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Apr 7 21:28:10 EDT 2018
Revision: 23167
http://svnweb.midnightbsd.org/mports/?rev=23167
Author: laffer1
Date: 2018-04-07 21:28:09 -0400 (Sat, 07 Apr 2018)
Log Message:
-----------
icu 58.1
Modified Paths:
--------------
trunk/devel/icu/Makefile
trunk/devel/icu/distinfo
trunk/devel/icu/pkg-plist
Added Paths:
-----------
trunk/devel/icu/files/patch-r39484
Removed Paths:
-------------
trunk/devel/icu/files/patch-layout_Makefile.in
Modified: trunk/devel/icu/Makefile
===================================================================
--- trunk/devel/icu/Makefile 2018-04-08 01:21:46 UTC (rev 23166)
+++ trunk/devel/icu/Makefile 2018-04-08 01:28:09 UTC (rev 23167)
@@ -3,7 +3,7 @@
#
PORTNAME= icu
-PORTVERSION= 57.1
+PORTVERSION= 58.1
CATEGORIES= devel
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \
SF/${PORTNAME}/ICU4C/${PORTVERSION}/
Modified: trunk/devel/icu/distinfo
===================================================================
--- trunk/devel/icu/distinfo 2018-04-08 01:21:46 UTC (rev 23166)
+++ trunk/devel/icu/distinfo 2018-04-08 01:28:09 UTC (rev 23167)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523150004
-SHA256 (icu4c-57_1-src.tgz) = ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581
-SIZE (icu4c-57_1-src.tgz) = 22360664
+TIMESTAMP = 1523150781
+SHA256 (icu4c-58_1-src.tgz) = 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309
+SIZE (icu4c-58_1-src.tgz) = 23366443
Deleted: trunk/devel/icu/files/patch-layout_Makefile.in
===================================================================
--- trunk/devel/icu/files/patch-layout_Makefile.in 2018-04-08 01:21:46 UTC (rev 23166)
+++ trunk/devel/icu/files/patch-layout_Makefile.in 2018-04-08 01:28:09 UTC (rev 23167)
@@ -1,11 +0,0 @@
---- layout/Makefile.in.orig 2016-03-23 20:56:48 UTC
-+++ layout/Makefile.in
-@@ -180,7 +180,7 @@ install-local: install-headers install-l
- install-library: all-local
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- ifneq ($(ENABLE_STATIC),)
-- $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
Added: trunk/devel/icu/files/patch-r39484
===================================================================
--- trunk/devel/icu/files/patch-r39484 (rev 0)
+++ trunk/devel/icu/files/patch-r39484 2018-04-08 01:28:09 UTC (rev 23167)
@@ -0,0 +1,148 @@
+https://ssl.icu-project.org/trac/ticket/12827
+
+Index: test/intltest/apicoll.h
+===================================================================
+--- test/intltest/apicoll.h (revision 39483)
++++ test/intltest/apicoll.h (revision 39484)
+@@ -35,6 +35,7 @@ class CollationAPITest: public IntlTestCollator {
+ * - displayable name in the desired locale
+ */
+ void TestProperty(/* char* par */);
++ void TestKeywordValues();
+
+ /**
+ * This tests the RuleBasedCollator
+Index: test/intltest/apicoll.cpp
+===================================================================
+--- test/intltest/apicoll.cpp (revision 39483)
++++ test/intltest/apicoll.cpp (revision 39484)
+@@ -81,17 +81,10 @@ CollationAPITest::TestProperty(/* char* par */)
+ logln("Test ctors : ");
+ col = Collator::createInstance(Locale::getEnglish(), success);
+ if (U_FAILURE(success)){
+- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));
++ errcheckln(success, "English 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;
+-
+ col->getVersion(versionArray);
+ // Check for a version greater than some value rather than equality
+ // so that we need not update the expected version each time.
+@@ -231,6 +224,29 @@ CollationAPITest::TestProperty(/* char* par */)
+ 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);
++}
++
+ void
+ CollationAPITest::TestRuleBasedColl()
+ {
+@@ -2466,6 +2482,7 @@ void CollationAPITest::runIndexedTest( int32_t ind
+ if (exec) logln("TestSuite CollationAPITest: ");
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestProperty);
++ TESTCASE_AUTO(TestKeywordValues);
+ TESTCASE_AUTO(TestOperators);
+ TESTCASE_AUTO(TestDuplicate);
+ TESTCASE_AUTO(TestCompare);
+Index: i18n/ucol_res.cpp
+===================================================================
+--- i18n/ucol_res.cpp (revision 39483)
++++ i18n/ucol_res.cpp (revision 39484)
+@@ -680,6 +680,7 @@ ucol_getKeywordValuesForLocale(const char* /*key*/
+ return NULL;
+ }
+ 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.
+ return en;
+Index: common/ulist.c
+===================================================================
+--- common/ulist.c (revision 39483)
++++ common/ulist.c (revision 39484)
+@@ -29,7 +29,6 @@ struct UList {
+ UListNode *tail;
+
+ int32_t size;
+- int32_t currentIndex;
+ };
+
+ static void ulist_addFirstItem(UList *list, UListNode *newItem);
+@@ -51,7 +50,6 @@ U_CAPI UList *U_EXPORT2 ulist_createEmptyList(UErr
+ newList->head = NULL;
+ newList->tail = NULL;
+ newList->size = 0;
+- newList->currentIndex = -1;
+
+ return newList;
+ }
+@@ -80,8 +78,9 @@ static void ulist_removeItem(UList *list, UListNod
+ } else {
+ p->next->previous = p->previous;
+ }
+- list->curr = NULL;
+- list->currentIndex = 0;
++ if (p == list->curr) {
++ list->curr = p->next;
++ }
+ --list->size;
+ if (p->forceDelete) {
+ uprv_free(p->data);
+@@ -150,7 +149,6 @@ U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList
+ newItem->next = list->head;
+ list->head->previous = newItem;
+ list->head = newItem;
+- list->currentIndex++;
+ }
+
+ list->size++;
+@@ -193,7 +191,6 @@ U_CAPI void *U_EXPORT2 ulist_getNext(UList *list)
+
+ curr = list->curr;
+ list->curr = curr->next;
+- list->currentIndex++;
+
+ return curr->data;
+ }
+@@ -209,7 +206,6 @@ U_CAPI int32_t U_EXPORT2 ulist_getListSize(const U
+ U_CAPI void U_EXPORT2 ulist_resetList(UList *list) {
+ if (list != NULL) {
+ list->curr = list->head;
+- list->currentIndex = 0;
+ }
+ }
+
+@@ -272,4 +268,3 @@ U_CAPI void U_EXPORT2 ulist_reset_keyword_values_i
+ U_CAPI UList * U_EXPORT2 ulist_getListFromEnum(UEnumeration *en) {
+ return (UList *)(en->context);
+ }
+-
Property changes on: trunk/devel/icu/files/patch-r39484
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/icu/pkg-plist
===================================================================
--- trunk/devel/icu/pkg-plist 2018-04-08 01:21:46 UTC (rev 23166)
+++ trunk/devel/icu/pkg-plist 2018-04-08 01:28:09 UTC (rev 23167)
@@ -15,14 +15,6 @@
lib/libicuio.so
lib/libicuio.so.%%ICUMAJOR%%
lib/libicuio.so.%%ICUVER%%
-lib/libicule.a
-lib/libicule.so
-lib/libicule.so.%%ICUMAJOR%%
-lib/libicule.so.%%ICUVER%%
-lib/libiculx.a
-lib/libiculx.so
-lib/libiculx.so.%%ICUMAJOR%%
-lib/libiculx.so.%%ICUVER%%
lib/libicutest.a
lib/libicutest.so
lib/libicutest.so.%%ICUMAJOR%%
@@ -41,25 +33,8 @@
lib/icu/%%ICUVER%%/pkgdata.inc
lib/icu/%%ICUVER%%/Makefile.inc
libdata/pkgconfig/icu-io.pc
-libdata/pkgconfig/icu-le.pc
libdata/pkgconfig/icu-i18n.pc
-libdata/pkgconfig/icu-lx.pc
libdata/pkgconfig/icu-uc.pc
-include/layout/LEFontInstance.h
-include/layout/LEGlyphFilter.h
-include/layout/LEGlyphStorage.h
-include/layout/LEInsertionList.h
-include/layout/LELanguages.h
-include/layout/LEScripts.h
-include/layout/LESwaps.h
-include/layout/LETableReference.h
-include/layout/LETypes.h
-include/layout/LayoutEngine.h
-include/layout/ParagraphLayout.h
-include/layout/RunArrays.h
-include/layout/loengine.h
-include/layout/playout.h
-include/layout/plruns.h
include/unicode/alphaindex.h
include/unicode/appendable.h
include/unicode/basictz.h
@@ -153,6 +128,7 @@
include/unicode/tzrule.h
include/unicode/tztrans.h
include/unicode/ubidi.h
+include/unicode/ubiditransform.h
include/unicode/ubrk.h
include/unicode/ucal.h
include/unicode/ucasemap.h
@@ -256,6 +232,7 @@
man/man8/gencmn.8.gz
man/man8/gensprep.8.gz
man/man8/icupkg.8.gz
+ at comment %%DATADIR%%/%%ICUVER%%/install-sh
%%DATADIR%%/%%ICUVER%%/mkinstalldirs
%%DATADIR%%/%%ICUVER%%/LICENSE
%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
More information about the Midnightbsd-cvs
mailing list