git: 2c2eb4692242 - main - devel/php*-intl: unbreak build with ICU 70

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2c2eb4692242d0f7c9e125920a712bc8f4ec0154

commit 2c2eb4692242d0f7c9e125920a712bc8f4ec0154
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-10-06 14:22:52 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-10-06 14:52:33 +0000

    devel/php*-intl: unbreak build with ICU 70
    
    In file included from breakiterator/breakiterator_class.cpp:21:
    breakiterator/codepointiterator_internal.h:40:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
                    virtual UBool operator==(const BreakIterator& that) const;
                            ~~~~~ ^
    /usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
        virtual bool operator==(const BreakIterator&) const = 0;
                ~~~~ ^
    
    PR:             258794
    Reported by:    antoine (via exp-run)
---
 devel/php73-intl/files/patch-icu70 | 38 ++++++++++++++++++++++++++++++++++++++
 devel/php74-intl/files/patch-icu70 | 38 ++++++++++++++++++++++++++++++++++++++
 devel/php80-intl/files/patch-icu70 | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+)

diff --git a/devel/php73-intl/files/patch-icu70 b/devel/php73-intl/files/patch-icu70
new file mode 100644
index 000000000000..a46cefcf5555
--- /dev/null
+++ b/devel/php73-intl/files/patch-icu70
@@ -0,0 +1,38 @@
+Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
+
+In file included from breakiterator/breakiterator_class.cpp:23:
+breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
+                virtual UBool operator==(const BreakIterator& that) const;
+                        ~~~~~ ^
+/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
+    virtual bool operator==(const BreakIterator&) const = 0;
+            ~~~~ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig	2021-09-21 10:24:05 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ 	clearCurrentCharIter();
+ }
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#else
++bool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#endif
+ {
+ 	if (typeid(*this) != typeid(that)) {
+ 		return FALSE;
+--- breakiterator/codepointiterator_internal.h.orig	2021-09-21 10:24:05 UTC
++++ breakiterator/codepointiterator_internal.h
+@@ -39,7 +39,11 @@ namespace PHP {
+ 
+ 		virtual ~CodePointBreakIterator();
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ 		virtual UBool operator==(const BreakIterator& that) const;
++#else
++		virtual bool operator==(const BreakIterator& that) const;
++#endif
+ 
+ 		virtual CodePointBreakIterator* clone(void) const;
+ 
diff --git a/devel/php74-intl/files/patch-icu70 b/devel/php74-intl/files/patch-icu70
new file mode 100644
index 000000000000..1bfee73209b9
--- /dev/null
+++ b/devel/php74-intl/files/patch-icu70
@@ -0,0 +1,38 @@
+Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
+
+In file included from breakiterator/breakiterator_class.cpp:23:
+breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
+                virtual UBool operator==(const BreakIterator& that) const;
+                        ~~~~~ ^
+/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
+    virtual bool operator==(const BreakIterator&) const = 0;
+            ~~~~ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig	2021-09-21 11:23:20 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ 	clearCurrentCharIter();
+ }
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#else
++bool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#endif
+ {
+ 	if (typeid(*this) != typeid(that)) {
+ 		return FALSE;
+--- breakiterator/codepointiterator_internal.h.orig	2021-09-21 11:23:20 UTC
++++ breakiterator/codepointiterator_internal.h
+@@ -39,7 +39,11 @@ namespace PHP {
+ 
+ 		virtual ~CodePointBreakIterator();
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ 		virtual UBool operator==(const BreakIterator& that) const;
++#else
++		virtual bool operator==(const BreakIterator& that) const;
++#endif
+ 
+ 		virtual CodePointBreakIterator* clone(void) const;
+ 
diff --git a/devel/php80-intl/files/patch-icu70 b/devel/php80-intl/files/patch-icu70
new file mode 100644
index 000000000000..d9b8932f356b
--- /dev/null
+++ b/devel/php80-intl/files/patch-icu70
@@ -0,0 +1,38 @@
+Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
+
+In file included from breakiterator/breakiterator_class.cpp:21:
+breakiterator/codepointiterator_internal.h:40:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
+                virtual UBool operator==(const BreakIterator& that) const;
+                        ~~~~~ ^
+/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
+    virtual bool operator==(const BreakIterator&) const = 0;
+            ~~~~ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig	2021-09-21 17:07:44 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -73,7 +73,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ 	clearCurrentCharIter();
+ }
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#else
++bool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#endif
+ {
+ 	if (typeid(*this) != typeid(that)) {
+ 		return false;
+--- breakiterator/codepointiterator_internal.h.orig	2021-09-21 17:07:44 UTC
++++ breakiterator/codepointiterator_internal.h
+@@ -37,7 +37,11 @@ namespace PHP {
+ 
+ 		virtual ~CodePointBreakIterator();
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 70
+ 		virtual UBool operator==(const BreakIterator& that) const;
++#else
++		virtual bool operator==(const BreakIterator& that) const;
++#endif
+ 
+ 		virtual CodePointBreakIterator* clone(void) const;
+