php56-intl: fix icu>=70 fallout. Backport from php74-intl.

3 files changed, 35 insertions, 7 deletions

diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index 1aea7a1b031..f9975e95d29 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2021/10/26 10:51:47 nia Exp $
+$NetBSD: distinfo,v 1.61 2021/12/09 00:13:07 tnn Exp $
 
 BLAKE2s (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 9eaf6505d80e90147fd0b993fb501620030eea24ccd69e42c49d8faf50d47775
 SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4
@@ -11,7 +11,8 @@ SHA1 (patch-configure) = a5623b0cbb3331fd0a537b26c0ae48315d52dbe2
 SHA1 (patch-disable-filter-url) = a2b08912d81f2872bf1834fa4cefddb044c9d0f8
 SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
-SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = f4cf2a1cc650ed9a4291924c2ed9fcbd7061e33b
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = 98ff92cbc5e4a92310a168e9959dd702b18e0783
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.h) = 01424bd7758505d9800b7f7e9e09d153b908506f
 SHA1 (patch-ext_intl_collator_collator__convert.c) = 91f5b8458eebc0c2f3871f76a522f627e4cf4fbf
 SHA1 (patch-ext_intl_collator_collator__error.c) = 94a26ee166506f7f77dd762e9c789d0e803f2b3c
 SHA1 (patch-ext_intl_collator_collator__locale.c) = ab48d5fac5a80b1c4c25fef61993a889a8014e3f
diff --git a/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp b/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
index 521b32a3a08..4656cbcc4dd 100644
--- a/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
+++ b/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2021/12/09 00:13:07 tnn 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
@@ -11,8 +13,15 @@ $NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020
  
  	//don't bother copying the character iterator, getText() is deprecated
  	clearCurrentCharIter();
-@@ -75,17 +75,17 @@ CodePointBreakIterator::~CodePointBreakI
+@@ -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;
@@ -32,7 +41,7 @@ $NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020
  }
  
  CodePointBreakIterator* CodePointBreakIterator::clone(void) const
-@@ -106,7 +106,7 @@ CharacterIterator& CodePointBreakIterato
+@@ -106,7 +110,7 @@ CharacterIterator& CodePointBreakIterato
  
  UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
  {
@@ -41,7 +50,7 @@ $NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020
  }
  
  void CodePointBreakIterator::setText(const UnicodeString &text)
-@@ -125,7 +125,7 @@ void CodePointBreakIterator::setText(UTe
+@@ -125,7 +129,7 @@ void CodePointBreakIterator::setText(UTe
  		return;
  	}
  
@@ -50,7 +59,7 @@ $NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020
  
  	clearCurrentCharIter();
  }
-@@ -277,7 +277,7 @@ CodePointBreakIterator &CodePointBreakIt
+@@ -277,7 +281,7 @@ CodePointBreakIterator &CodePointBreakIt
  	}
  
  	int64_t pos = utext_getNativeIndex(this->fText);
diff --git a/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h b/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h
new file mode 100644
index 00000000000..275cb1c9f97
--- /dev/null
+++ b/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.h,v 1.1 2021/12/09 00:13:07 tnn Exp $
+
+php73-intl: fix icu>=70 fallout. Backport from php74-intl.
+
+--- ext/intl/breakiterator/codepointiterator_internal.h.orig	2019-01-09 09:54:13.000000000 +0000
++++ ext/intl/breakiterator/codepointiterator_internal.h
+@@ -36,7 +36,11 @@ namespace PHP {
+ 
+ 		virtual ~CodePointBreakIterator();
+ 
++#if U_ICU_VERSION_MAJOR_NUM >= 70
++		virtual bool operator==(const BreakIterator& that) const;
++#else
+ 		virtual UBool operator==(const BreakIterator& that) const;
++#endif
+ 
+ 		virtual CodePointBreakIterator* clone(void) const;
+