aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-11-04 22:31:42 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-09-30 01:45:26 +0000
commit36d73f4cab3718caa6efa74c223ab9392b2035e2 (patch)
treed65a365410f08cb27c7dc137fbd13daf6724573d
parent8b46fac80dc70082f460d0ca268490eed0d68a21 (diff)
devel/icu-le-hb: update to 1.0.3.7
-rw-r--r--devel/icu-le-hb/Makefile5
-rw-r--r--devel/icu-le-hb/distinfo6
-rw-r--r--devel/icu-le-hb/files/patch-icu6853
3 files changed, 5 insertions, 59 deletions
diff --git a/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index 53eadca30f30..50a0d2dcd07d 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -1,7 +1,6 @@
PORTNAME= icu-le-hb
-DISTVERSION= 1.0.3-3
-DISTVERSIONSUFFIX= -gb8a3163
-PORTREVISION= 17
+DISTVERSION= 1.0.3-7
+DISTVERSIONSUFFIX= -g04505b2
CATEGORIES= devel print
MAINTAINER= office@FreeBSD.org
diff --git a/devel/icu-le-hb/distinfo b/devel/icu-le-hb/distinfo
index 891f0027dad3..bddfa6305406 100644
--- a/devel/icu-le-hb/distinfo
+++ b/devel/icu-le-hb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478864317
-SHA256 (behdad-icu-le-hb-1.0.3-3-gb8a3163_GH0.tar.gz) = ea4b63540df6be1fd1cbe0ba0fb559d6a9b73973efe4bc1094698c383e9a25b4
-SIZE (behdad-icu-le-hb-1.0.3-3-gb8a3163_GH0.tar.gz) = 39655
+TIMESTAMP = 1604529102
+SHA256 (behdad-icu-le-hb-1.0.3-7-g04505b2_GH0.tar.gz) = b8d1a3311cb1c90836abe32895c3cc6880d7fa352a70fbcb57336591da3ee4ff
+SIZE (behdad-icu-le-hb-1.0.3-7-g04505b2_GH0.tar.gz) = 39658
diff --git a/devel/icu-le-hb/files/patch-icu68 b/devel/icu-le-hb/files/patch-icu68
deleted file mode 100644
index 2d9b0b657eda..000000000000
--- a/devel/icu-le-hb/files/patch-icu68
+++ /dev/null
@@ -1,53 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-LEFontInstance.cpp:82:39: error: use of undeclared identifier 'TRUE'
- return mapCharToGlyph(ch, mapper, TRUE);
- ^
-LEGlyphStorage.cpp:662:12: error: use of undeclared identifier 'FALSE'
- return FALSE;
- ^
-LEInsertionList.cpp:89:20: error: use of undeclared identifier 'TRUE'
- return TRUE;
- ^
-LEInsertionList.cpp:93:12: error: use of undeclared identifier 'FALSE'
- return FALSE;
- ^
-
---- src/LEFontInstance.cpp.orig 2016-11-13 06:15:24 UTC
-+++ src/LEFontInstance.cpp
-@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode
-
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
- {
-- return mapCharToGlyph(ch, mapper, TRUE);
-+ return mapCharToGlyph(ch, mapper, true);
- }
-
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
---- src/LEGlyphStorage.cpp.orig 2016-11-13 06:15:24 UTC
-+++ src/LEGlyphStorage.cpp
-@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosi
- // just got replaced by the insertion
- fSrcIndex -= 1;
-
-- return FALSE;
-+ return false;
- }
-
- U_NAMESPACE_END
---- src/LEInsertionList.cpp.orig 2016-11-13 06:15:24 UTC
-+++ src/LEInsertionList.cpp
-@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCa
- {
- for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
- if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
-- return TRUE;
-+ return true;
- }
- }
-
-- return FALSE;
-+ return false;
- }
-
- U_NAMESPACE_END