head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.36 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.34 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.32 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.30 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.28 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.26 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.24 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.22 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.20 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.18 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.16 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.14 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.12 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.10 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.8 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.6 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.4 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.2 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.1.0.8 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.6 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.4 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.2 pkgsrc-2020Q4-base:1.1; locks; strict; comment @// @; 1.2 date 2021.12.09.00.13.07; author tnn; state Exp; branches; next 1.1; commitid Um40JTBylwEajUjD; 1.1 date 2020.11.16.12.10.05; author ryoon; state Exp; branches; next ; commitid pWiQNKjti7ZkK6wC; desc @@ 1.2 log @php56-intl: fix icu>=70 fallout. Backport from php74-intl. @ text @$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $ php56-intl: fix icu>=70 fallout. Backport from php74-intl. --- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2019-01-09 09:54:13.000000000 +0000 +++ ext/intl/breakiterator/codepointiterator_internal.cpp @@@@ -55,7 +55,7 @@@@ CodePointBreakIterator& CodePointBreakIt return *this; } - this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + this->fText = utext_clone(this->fText, that.fText, false, true, &uec); //don't bother copying the character iterator, getText() is deprecated clearCurrentCharIter(); @@@@ -72,20 +72,24 @@@@ CodePointBreakIterator::~CodePointBreakI clearCurrentCharIter(); } +#if U_ICU_VERSION_MAJOR_NUM >= 70 +bool CodePointBreakIterator::operator==(const BreakIterator& that) const +#else UBool CodePointBreakIterator::operator==(const BreakIterator& that) const +#endif { if (typeid(*this) != typeid(that)) { - return FALSE; + return false; } const CodePointBreakIterator& that2 = static_cast(that); if (!utext_equals(this->fText, that2.fText)) { - return FALSE; + return false; } - return TRUE; + return true; } CodePointBreakIterator* CodePointBreakIterator::clone(void) const @@@@ -106,7 +110,7 @@@@ CharacterIterator& CodePointBreakIterato UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const { - return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + return utext_clone(fillIn, this->fText, false, true, &status); } void CodePointBreakIterator::setText(const UnicodeString &text) @@@@ -125,7 +129,7 @@@@ void CodePointBreakIterator::setText(UTe return; } - this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + this->fText = utext_clone(this->fText, text, false, true, &status); clearCurrentCharIter(); } @@@@ -277,7 +281,7 @@@@ CodePointBreakIterator &CodePointBreakIt } int64_t pos = utext_getNativeIndex(this->fText); - this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + this->fText = utext_clone(this->fText, input, false, true, &status); if (U_FAILURE(status)) { return *this; } @ 1.1 log @php56: Fix php-intl module build with textproc/icu-68.1 @ text @d1 3 a3 1 $NetBSD$ d16 7 a22 1 @@@@ -75,17 +75,17 @@@@ CodePointBreakIterator::~CodePointBreakI d24 1 d44 1 a44 1 @@@@ -106,7 +106,7 @@@@ CharacterIterator& CodePointBreakIterato d53 1 a53 1 @@@@ -125,7 +125,7 @@@@ void CodePointBreakIterator::setText(UTe d62 1 a62 1 @@@@ -277,7 +277,7 @@@@ CodePointBreakIterator &CodePointBreakIt @