diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
commit | 6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9 (patch) | |
tree | db7a5d68a7b148f62f63c9562391af1272e3f376 /lang/gnustep-base | |
parent | 91d87ad6cea9c90bdf179910d1ab72b833a67768 (diff) | |
download | ports-6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9.tar.gz ports-6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9.zip |
devel/icu: update to 68.1
Changes: http://site.icu-project.org/download/68
ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/
Reported by: GitHub (watch releases)
Notes
Notes:
svn path=/head/; revision=553940
Diffstat (limited to 'lang/gnustep-base')
-rw-r--r-- | lang/gnustep-base/Makefile | 2 | ||||
-rw-r--r-- | lang/gnustep-base/files/patch-icu68 | 185 |
2 files changed, 186 insertions, 1 deletions
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index bb3b4f705a8c..f24e9f6d3ea1 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnustep-base DISTVERSIONPREFIX= base- DISTVERSION= 1_26_0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang devel gnustep MAINTAINER= ports@FreeBSD.org diff --git a/lang/gnustep-base/files/patch-icu68 b/lang/gnustep-base/files/patch-icu68 new file mode 100644 index 000000000000..52ae3bc79e77 --- /dev/null +++ b/lang/gnustep-base/files/patch-icu68 @@ -0,0 +1,185 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +GSICUString.m:71:18: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:80:18: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +GSICUString.m:104:18: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:113:18: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +GSICUString.m:135:10: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:170:66: error: use of undeclared identifier 'TRUE' + UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE); + ^ +NSRegularExpression.m:185:29: error: use of undeclared identifier 'FALSE' + utext_clone(&str->txt, t, FALSE, TRUE, &s); + ^ +NSRegularExpression.m:185:36: error: use of undeclared identifier 'TRUE' + utext_clone(&str->txt, t, FALSE, TRUE, &s); + ^ +NSRegularExpression.m:842:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:842:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:876:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:876:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:914:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:914:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:291:14: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +NSRegularExpression.m:368:36: error: use of undeclared identifier 'FALSE' + uregex_useAnchoringBounds(r, FALSE, &s); + ^ +NSRegularExpression.m:372:38: error: use of undeclared identifier 'TRUE' + uregex_useTransparentBounds(r, TRUE, &s); + ^ + +--- Source/GSICUString.m.orig 2019-01-06 22:33:45 UTC ++++ Source/GSICUString.m +@@ -68,7 +68,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * to match it. + */ + ut->chunkOffset = nativeIndex - nativeStart; +- return TRUE; ++ return true; + } + + if (nativeIndex >= length && nativeLimit >= length) +@@ -77,7 +77,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * Limit it to point just after the last character. + */ + ut->chunkOffset = ut->chunkLength; +- return FALSE; ++ return false; + } + + /* Set up to fill the chunk with characters from the string +@@ -101,7 +101,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * to match it. + */ + ut->chunkOffset = nativeIndex - nativeStart; +- return TRUE; ++ return true; + } + + if (nativeIndex <= 0 && nativeStart <= 0) +@@ -110,7 +110,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * Limit it to position of the first character. + */ + ut->chunkOffset = 0; +- return FALSE; ++ return false; + } + + nativeLimit = nativeIndex; +@@ -132,7 +132,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + ut->chunkNativeStart = nativeStart; + ut->nativeIndexingLimit = r.length; + ut->chunkLength = r.length; +- return TRUE; ++ return true; + } + + /** +@@ -167,7 +167,7 @@ UTextNSMutableStringReplace(UText *ut, + // Setting the chunk length to 0 here forces UTextNSStringAccess to fetch + // the data from the string object. + ut->chunkLength = 0; +- UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE); ++ UTextNSStringAccess(ut, r.location + [replacement length] + 1, true); + ut->chunkOffset++; + + [replacement release]; +--- Source/NSRegularExpression.m.orig 2019-01-06 22:33:45 UTC ++++ Source/NSRegularExpression.m +@@ -182,7 +182,7 @@ NSRegularExpressionOptionsToURegexpFlags(NSRegularExpr + return nil; + } + str = [GSUTextString new]; +- utext_clone(&str->txt, t, FALSE, TRUE, &s); ++ utext_clone(&str->txt, t, false, true, &s); + return [str autorelease]; + } + #else +@@ -288,7 +288,7 @@ callback(const void *context, int32_t steps) + + if (NULL == context) + { +- return FALSE; ++ return false; + } + CALL_BLOCK(block, nil, NSMatchingProgress, &stop); + return stop; +@@ -365,11 +365,11 @@ setupRegex(URegularExpression *regex, + uregex_setRegion(r, range.location, range.location+range.length, &s); + if (options & NSMatchingWithoutAnchoringBounds) + { +- uregex_useAnchoringBounds(r, FALSE, &s); ++ uregex_useAnchoringBounds(r, false, &s); + } + if (options & NSMatchingWithTransparentBounds) + { +- uregex_useTransparentBounds(r, TRUE, &s); ++ uregex_useTransparentBounds(r, true, &s); + } + uregex_setTimeLimit(r, _workLimit, &s); + if (U_FAILURE(s)) +@@ -401,11 +401,11 @@ setupRegex(URegularExpression *regex, + uregex_setRegion(r, range.location, range.location+range.length, &s); + if (options & NSMatchingWithoutAnchoringBounds) + { +- uregex_useAnchoringBounds(r, FALSE, &s); ++ uregex_useAnchoringBounds(r, false, &s); + } + if (options & NSMatchingWithTransparentBounds) + { +- uregex_useTransparentBounds(r, TRUE, &s); ++ uregex_useTransparentBounds(r, true, &s); + } + uregex_setTimeLimit(r, _workLimit, &s); + if (U_FAILURE(s)) +@@ -839,7 +839,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return 0; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + [string setString: ret]; + [ret release]; + uregex_close(r); +@@ -873,7 +873,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return nil; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + uregex_close(r); + + utext_close(&txt); +@@ -911,7 +911,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return nil; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + uregex_close(r); + + utext_close(&txt); |