From 9a14a6de30a3caf71d801abdaca1fa6ee877432e Mon Sep 17 00:00:00 2001 From: jbeich Date: Fri, 29 Jun 2018 14:22:11 +0000 Subject: [PATCH] devel/icu: update to 63.1 Changes: http://site.icu-project.org/download/63 ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/ PR: 232300 Exp-run by: antoine (NOT YET) --- devel/icu/Makefile | 7 ++-- devel/icu/distinfo | 6 +-- devel/icu/files/patch-r41550 | 77 ------------------------------------ devel/icu/pkg-plist | 4 ++ 4 files changed, 10 insertions(+), 84 deletions(-) delete mode 100644 devel/icu/files/patch-r41550 diff --git a/devel/icu/Makefile b/devel/icu/Makefile index fe255b2d502b..64203e3d5ab5 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= icu -DISTVERSION= 62_1 -PORTREVISION?= 2 # keep for icu-lx +DISTVERSION= 63_1 +PORTREVISION?= 0 # keep for icu-lx PORTEPOCH?= 1 CATEGORIES?= devel -MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ - SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION} +MASTER_SITES= https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/_/-/g}/ DISTNAME= icu4c-${DISTVERSION}-src MAINTAINER= office@FreeBSD.org diff --git a/devel/icu/distinfo b/devel/icu/distinfo index 3de9d3990e01..2899b0537f33 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529573964 -SHA256 (icu4c-62_1-src.tgz) = 3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3 -SIZE (icu4c-62_1-src.tgz) = 23468750 +TIMESTAMP = 1538433596 +SHA256 (icu4c-63_1-src.tgz) = 05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d +SIZE (icu4c-63_1-src.tgz) = 23746939 diff --git a/devel/icu/files/patch-r41550 b/devel/icu/files/patch-r41550 deleted file mode 100644 index cf0cfe4f9196..000000000000 --- a/devel/icu/files/patch-r41550 +++ /dev/null @@ -1,77 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/13851 - ---- common/ucase.cpp.orig 2018-06-21 09:39:23 UTC -+++ common/ucase.cpp -@@ -270,6 +270,7 @@ ucase_addCaseClosure(UChar32 c, const USetAdder *sa) { - } - } - if(HAS_SLOT(excWord, UCASE_EXC_DELTA)) { -+ pe=pe0; - int32_t delta; - GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta); - sa->add(sa->set, (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta); -@@ -1167,7 +1168,7 @@ ucase_toFullLower(UChar32 c, - - if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) { - int32_t delta; -- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta); -+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta); - return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta; - } - if(HAS_SLOT(excWord, UCASE_EXC_LOWER)) { -@@ -1261,7 +1262,7 @@ toUpperOrTitle(UChar32 c, - - if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_GET_TYPE(props)==UCASE_LOWER) { - int32_t delta; -- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta); -+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta); - return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta; - } - if(!upperNotTitle && HAS_SLOT(excWord, UCASE_EXC_TITLE)) { -@@ -1469,7 +1470,7 @@ ucase_toFullFolding(UChar32 c, - } - if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) { - int32_t delta; -- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta); -+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta); - return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta; - } - if(HAS_SLOT(excWord, UCASE_EXC_FOLD)) { ---- test/intltest/strcase.cpp.orig 2018-06-21 09:38:41 UTC -+++ test/intltest/strcase.cpp -@@ -68,6 +68,7 @@ class StringCaseTest: public IntlTest { (public) - void TestBug13127(); - void TestInPlaceTitle(); - void TestCaseMapEditsIteratorDocs(); -+ void TestCaseMapGreekExtended(); - - private: - void assertGreekUpper(const char16_t *s, const char16_t *expected); -@@ -113,6 +114,7 @@ StringCaseTest::runIndexedTest(int32_t index, UBool ex - TESTCASE_AUTO(TestInPlaceTitle); - #endif - TESTCASE_AUTO(TestCaseMapEditsIteratorDocs); -+ TESTCASE_AUTO(TestCaseMapGreekExtended); - TESTCASE_AUTO_END; - } - -@@ -1683,6 +1685,19 @@ void StringCaseTest::TestCaseMapEditsIteratorDocs() { - expectedSrcCoarseStringIndices[destIndex], - coarseChangesIterator.sourceIndexFromDestinationIndex(destIndex, status)); - } -+} -+ -+void StringCaseTest::TestCaseMapGreekExtended() { -+ // Ticket 13851 -+ UnicodeString s(u"\u1F80\u1F88\u1FFC"); -+ UnicodeString result(s); -+ result.toLower(Locale::getRoot()); -+ assertEquals(u"lower", u"\u1F80\u1F80\u1FF3", result); -+#if !UCONFIG_NO_BREAK_ITERATION -+ result = s; -+ result.toTitle(nullptr, Locale::getRoot()); -+ assertEquals(u"title", u"\u1F88\u1F80\u1FF3", result); -+#endif - } - - //#endif diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist index 68450ba9108a..2b1b8d06aa81 100644 --- a/devel/icu/pkg-plist +++ b/devel/icu/pkg-plist @@ -92,6 +92,7 @@ include/unicode/normalizer2.h include/unicode/normlzr.h include/unicode/nounit.h include/unicode/numberformatter.h +include/unicode/numberrangeformatter.h include/unicode/numfmt.h include/unicode/numsys.h include/unicode/parseerr.h @@ -152,6 +153,8 @@ include/unicode/ucnvsel.h include/unicode/ucol.h include/unicode/ucoleitr.h include/unicode/uconfig.h +include/unicode/ucpmap.h +include/unicode/ucptrie.h include/unicode/ucsdet.h include/unicode/ucurr.h include/unicode/udat.h @@ -172,6 +175,7 @@ include/unicode/ulocdata.h include/unicode/umachine.h include/unicode/umisc.h include/unicode/umsg.h +include/unicode/umutablecptrie.h include/unicode/unifilt.h include/unicode/unifunct.h include/unicode/unimatch.h