Attachment #198206 for bug #232300




# $FreeBSD$

PORTNAME=	icu
DISTVERSION=	63_1
PORTREVISION?=	0 # keep for icu-lx
PORTEPOCH?=	1
CATEGORIES?=	devel
MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/_/-/g}/
		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
DISTNAME=	icu4c-${DISTVERSION}-src

MAINTAINER=	office@FreeBSD.org

Lines 1-3 Link Here

(-)b/devel/icu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529573964	1	TIMESTAMP = 1538433596
2	SHA256 (icu4c-62_1-src.tgz) = 3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3	2	SHA256 (icu4c-63_1-src.tgz) = 05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
3	SIZE (icu4c-62_1-src.tgz) = 23468750	3	SIZE (icu4c-63_1-src.tgz) = 23746939




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

Lines 92-97 include/unicode/normalizer2.h Link Here

(-)b/devel/icu/pkg-plist (+4 lines)
92	include/unicode/normlzr.h	92	include/unicode/normlzr.h
93	include/unicode/nounit.h	93	include/unicode/nounit.h
94	include/unicode/numberformatter.h	94	include/unicode/numberformatter.h
		95	include/unicode/numberrangeformatter.h
95	include/unicode/numfmt.h	96	include/unicode/numfmt.h
96	include/unicode/numsys.h	97	include/unicode/numsys.h
97	include/unicode/parseerr.h	98	include/unicode/parseerr.h
Lines 152-157 include/unicode/ucnvsel.h Link Here
152	include/unicode/ucol.h	153	include/unicode/ucol.h
153	include/unicode/ucoleitr.h	154	include/unicode/ucoleitr.h
154	include/unicode/uconfig.h	155	include/unicode/uconfig.h
		156	include/unicode/ucpmap.h
		157	include/unicode/ucptrie.h
155	include/unicode/ucsdet.h	158	include/unicode/ucsdet.h
156	include/unicode/ucurr.h	159	include/unicode/ucurr.h
157	include/unicode/udat.h	160	include/unicode/udat.h
Lines 172-177 include/unicode/ulocdata.h Link Here
172	include/unicode/umachine.h	175	include/unicode/umachine.h
173	include/unicode/umisc.h	176	include/unicode/umisc.h
174	include/unicode/umsg.h	177	include/unicode/umsg.h
		178	include/unicode/umutablecptrie.h
175	include/unicode/unifilt.h	179	include/unicode/unifilt.h
176	include/unicode/unifunct.h	180	include/unicode/unifunct.h
177	include/unicode/unimatch.h	181	include/unicode/unimatch.h

Return to bug 232300

Lines 2-13 Link Here

(-)b/devel/icu/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= icu	4	PORTNAME= icu
5	DISTVERSION= 62_1	5	DISTVERSION= 63_1
6	PORTREVISION?= 2 # keep for icu-lx	6	PORTREVISION?= 0 # keep for icu-lx
7	PORTEPOCH?= 1	7	PORTEPOCH?= 1
8	CATEGORIES?= devel	8	CATEGORIES?= devel
9	MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \	9	MASTER_SITES= https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/_/-/g}/
10	SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
11	DISTNAME= icu4c-${DISTVERSION}-src	10	DISTNAME= icu4c-${DISTVERSION}-src
12		11
13	MAINTAINER= office@FreeBSD.org	12	MAINTAINER= office@FreeBSD.org

Removed Link Here

(-)a/devel/icu/files/patch-r41550 (-77 lines)
1	https://ssl.icu-project.org/trac/ticket/13851
2
3	--- common/ucase.cpp.orig 2018-06-21 09:39:23 UTC
4	+++ common/ucase.cpp
5	@@ -270,6 +270,7 @@ ucase_addCaseClosure(UChar32 c, const USetAdder *sa) {
6	}
7	}
8	if(HAS_SLOT(excWord, UCASE_EXC_DELTA)) {
9	+ pe=pe0;
10	int32_t delta;
11	GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
12	sa->add(sa->set, (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta);
13	@@ -1167,7 +1168,7 @@ ucase_toFullLower(UChar32 c,
14
15	if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) {
16	int32_t delta;
17	- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
18	+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
19	return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
20	}
21	if(HAS_SLOT(excWord, UCASE_EXC_LOWER)) {
22	@@ -1261,7 +1262,7 @@ toUpperOrTitle(UChar32 c,
23
24	if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_GET_TYPE(props)==UCASE_LOWER) {
25	int32_t delta;
26	- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
27	+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
28	return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
29	}
30	if(!upperNotTitle && HAS_SLOT(excWord, UCASE_EXC_TITLE)) {
31	@@ -1469,7 +1470,7 @@ ucase_toFullFolding(UChar32 c,
32	}
33	if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) {
34	int32_t delta;
35	- GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
36	+ GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
37	return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
38	}
39	if(HAS_SLOT(excWord, UCASE_EXC_FOLD)) {
40	--- test/intltest/strcase.cpp.orig 2018-06-21 09:38:41 UTC
41	+++ test/intltest/strcase.cpp
42	@@ -68,6 +68,7 @@ class StringCaseTest: public IntlTest { (public)
43	void TestBug13127();
44	void TestInPlaceTitle();
45	void TestCaseMapEditsIteratorDocs();
46	+ void TestCaseMapGreekExtended();
47
48	private:
49	void assertGreekUpper(const char16_t s, const char16_t expected);
50	@@ -113,6 +114,7 @@ StringCaseTest::runIndexedTest(int32_t index, UBool ex
51	TESTCASE_AUTO(TestInPlaceTitle);
52	#endif
53	TESTCASE_AUTO(TestCaseMapEditsIteratorDocs);
54	+ TESTCASE_AUTO(TestCaseMapGreekExtended);
55	TESTCASE_AUTO_END;
56	}
57
58	@@ -1683,6 +1685,19 @@ void StringCaseTest::TestCaseMapEditsIteratorDocs() {
59	expectedSrcCoarseStringIndices[destIndex],
60	coarseChangesIterator.sourceIndexFromDestinationIndex(destIndex, status));
61	}
62	+}
63	+
64	+void StringCaseTest::TestCaseMapGreekExtended() {
65	+ // Ticket 13851
66	+ UnicodeString s(u"\u1F80\u1F88\u1FFC");
67	+ UnicodeString result(s);
68	+ result.toLower(Locale::getRoot());
69	+ assertEquals(u"lower", u"\u1F80\u1F80\u1FF3", result);
70	+#if !UCONFIG_NO_BREAK_ITERATION
71	+ result = s;
72	+ result.toTitle(nullptr, Locale::getRoot());
73	+ assertEquals(u"title", u"\u1F88\u1F80\u1FF3", result);
74	+#endif
75	}
76
77	//#endif