[pkgsrc/trunk]: pkgsrc/lang/php73 php73-intl: fix icu>=70 fallout. Backport f...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3af8e12a710a
branches:  trunk
changeset: 770780:3af8e12a710a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Dec 08 23:55:19 2021 +0000

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

diffstat:

 lang/php73/distinfo                                                             |   5 +-
 lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp |  20 +++++++---
 lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h   |  18 +++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diffs (100 lines):

diff -r 78bfa4d809ce -r 3af8e12a710a lang/php73/distinfo
--- a/lang/php73/distinfo       Wed Dec 08 23:53:30 2021 +0000
+++ b/lang/php73/distinfo       Wed Dec 08 23:55:19 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2021/11/19 14:27:56 taca Exp $
+$NetBSD: distinfo,v 1.42 2021/12/08 23:55:19 tnn Exp $
 
 BLAKE2s (php-7.3.33.tar.xz) = 70274d12e2c97a29a17782f4ae630b50b804de3d5018fc2f3efcf7a6ea366628
 SHA512 (php-7.3.33.tar.xz) = b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25
@@ -6,7 +6,8 @@
 SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
-SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b6faa82ae8effc838288aed8dd809b610ce51a91
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.h) = 031a7095b3b15aa88881e2f5251960f19eedc326
 SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530
 SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead
 SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617
diff -r 78bfa4d809ce -r 3af8e12a710a lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
--- a/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp   Wed Dec 08 23:53:30 2021 +0000
+++ b/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp   Wed Dec 08 23:55:19 2021 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2021/12/08 23:55:19 tnn Exp $
 
 Use stdbool true/false macros.
+php73-intl: fix icu>=70 fallout. Backport from php74-intl.
 
---- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 15:01:59.000000000 +0000
+--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2021-11-16 11:18:31.000000000 +0000
 +++ ext/intl/breakiterator/codepointiterator_internal.cpp
 @@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt
                return *this;
@@ -13,8 +14,15 @@
  
        //don't bother copying the character iterator, getText() is deprecated
        clearCurrentCharIter();
-@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakI
+@@ -75,20 +75,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;
@@ -34,7 +42,7 @@
  }
  
  CodePointBreakIterator* CodePointBreakIterator::clone(void) const
-@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterato
+@@ -109,7 +113,7 @@ CharacterIterator& CodePointBreakIterato
  
  UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
  {
@@ -43,7 +51,7 @@
  }
  
  void CodePointBreakIterator::setText(const UnicodeString &text)
-@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UTe
+@@ -128,7 +132,7 @@ void CodePointBreakIterator::setText(UTe
                return;
        }
  
@@ -52,7 +60,7 @@
  
        clearCurrentCharIter();
  }
-@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIt
+@@ -280,7 +284,7 @@ CodePointBreakIterator &CodePointBreakIt
        }
  
        int64_t pos = utext_getNativeIndex(this->fText);
diff -r 78bfa4d809ce -r 3af8e12a710a lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h     Wed Dec 08 23:55:19 2021 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.h,v 1.1 2021/12/08 23:55:19 tnn Exp $
+
+php73-intl: fix icu>=70 fallout. Backport from php74-intl.
+
+--- ext/intl/breakiterator/codepointiterator_internal.h.orig   2021-11-16 11:18:31.000000000 +0000
++++ ext/intl/breakiterator/codepointiterator_internal.h
+@@ -39,7 +39,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;
+