Wed Dec 8 23:55:19 2021 UTC ()
php73-intl: fix icu>=70 fallout. Backport from php74-intl.


(tnn)
diff -r1.41 -r1.42 pkgsrc/lang/php73/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
diff -r0 -r1.1 pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.h
cvs diff -r1.41 -r1.42 pkgsrc/lang/php73/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php73/Attic/distinfo 2021/11/19 14:27:56 1.41
+++ pkgsrc/lang/php73/Attic/distinfo 2021/12/08 23:55:19 1.42
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1$NetBSD: distinfo,v 1.41 2021/11/19 14:27:56 taca Exp $ 1$NetBSD: distinfo,v 1.42 2021/12/08 23:55:19 tnn Exp $
2 2
3BLAKE2s (php-7.3.33.tar.xz) = 70274d12e2c97a29a17782f4ae630b50b804de3d5018fc2f3efcf7a6ea366628 3BLAKE2s (php-7.3.33.tar.xz) = 70274d12e2c97a29a17782f4ae630b50b804de3d5018fc2f3efcf7a6ea366628
4SHA512 (php-7.3.33.tar.xz) = b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25 4SHA512 (php-7.3.33.tar.xz) = b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25
5Size (php-7.3.33.tar.xz) = 12143820 bytes 5Size (php-7.3.33.tar.xz) = 12143820 bytes
6SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b 6SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
7SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640 7SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
8SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335 8SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
9SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7 9SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b6faa82ae8effc838288aed8dd809b610ce51a91
 10SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.h) = 031a7095b3b15aa88881e2f5251960f19eedc326
10SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530 11SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530
11SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead 12SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead
12SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617 13SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617
13SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = da8e7a227c04f366aa9aab08c5042826baa965fe 14SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = da8e7a227c04f366aa9aab08c5042826baa965fe
14SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 48dc73ca68df2454549bb81de6da6753bbb097bc 15SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 48dc73ca68df2454549bb81de6da6753bbb097bc
15SHA1 (patch-ext_openssl_openssl.c) = 1556ef20cb0d4e93985f213e9e9ab58ef0bd1a7c 16SHA1 (patch-ext_openssl_openssl.c) = 1556ef20cb0d4e93985f213e9e9ab58ef0bd1a7c
16SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd 17SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
17SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb 18SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
18SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 19SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
19SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 20SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
20SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462 21SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
21SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d 22SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
22SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 23SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
cvs diff -r1.1 -r1.2 pkgsrc/lang/php73/patches/Attic/patch-ext_intl_breakiterator_codepointiterator__internal.cpp (expand / switch to unified diff)

--- pkgsrc/lang/php73/patches/Attic/patch-ext_intl_breakiterator_codepointiterator__internal.cpp 2020/11/11 20:05:10 1.1
+++ pkgsrc/lang/php73/patches/Attic/patch-ext_intl_breakiterator_codepointiterator__internal.cpp 2021/12/08 23:55:19 1.2
@@ -1,63 +1,71 @@ @@ -1,63 +1,71 @@
1$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $ 1$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2021/12/08 23:55:19 tnn Exp $
2 2
3Use stdbool true/false macros. 3Use stdbool true/false macros.
 4php73-intl: fix icu>=70 fallout. Backport from php74-intl.
4 5
5--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 15:01:59.000000000 +0000 6--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2021-11-16 11:18:31.000000000 +0000
6+++ ext/intl/breakiterator/codepointiterator_internal.cpp 7+++ ext/intl/breakiterator/codepointiterator_internal.cpp
7@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt 8@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt
8 return *this; 9 return *this;
9 } 10 }
10  11
11- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); 12- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
12+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); 13+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
13  14
14 //don't bother copying the character iterator, getText() is deprecated 15 //don't bother copying the character iterator, getText() is deprecated
15 clearCurrentCharIter(); 16 clearCurrentCharIter();
16@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakI 17@@ -75,20 +75,24 @@ CodePointBreakIterator::~CodePointBreakI
 18 clearCurrentCharIter();
 19 }
 20
 21+#if U_ICU_VERSION_MAJOR_NUM >= 70
 22+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
 23+#else
17 UBool CodePointBreakIterator::operator==(const BreakIterator& that) const 24 UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
 25+#endif
18 { 26 {
19 if (typeid(*this) != typeid(that)) { 27 if (typeid(*this) != typeid(that)) {
20- return FALSE; 28- return FALSE;
21+ return false; 29+ return false;
22 } 30 }
23  31
24 const CodePointBreakIterator& that2 = 32 const CodePointBreakIterator& that2 =
25 static_cast<const CodePointBreakIterator&>(that); 33 static_cast<const CodePointBreakIterator&>(that);
26  34
27 if (!utext_equals(this->fText, that2.fText)) { 35 if (!utext_equals(this->fText, that2.fText)) {
28- return FALSE; 36- return FALSE;
29+ return false; 37+ return false;
30 } 38 }
31  39
32- return TRUE; 40- return TRUE;
33+ return true; 41+ return true;
34 } 42 }
35  43
36 CodePointBreakIterator* CodePointBreakIterator::clone(void) const 44 CodePointBreakIterator* CodePointBreakIterator::clone(void) const
37@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterato 45@@ -109,7 +113,7 @@ CharacterIterator& CodePointBreakIterato
38  46
39 UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const 47 UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
40 { 48 {
41- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); 49- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
42+ return utext_clone(fillIn, this->fText, false, true, &status); 50+ return utext_clone(fillIn, this->fText, false, true, &status);
43 } 51 }
44  52
45 void CodePointBreakIterator::setText(const UnicodeString &text) 53 void CodePointBreakIterator::setText(const UnicodeString &text)
46@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UTe 54@@ -128,7 +132,7 @@ void CodePointBreakIterator::setText(UTe
47 return; 55 return;
48 } 56 }
49  57
50- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); 58- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
51+ this->fText = utext_clone(this->fText, text, false, true, &status); 59+ this->fText = utext_clone(this->fText, text, false, true, &status);
52  60
53 clearCurrentCharIter(); 61 clearCurrentCharIter();
54 } 62 }
55@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIt 63@@ -280,7 +284,7 @@ CodePointBreakIterator &CodePointBreakIt
56 } 64 }
57  65
58 int64_t pos = utext_getNativeIndex(this->fText); 66 int64_t pos = utext_getNativeIndex(this->fText);
59- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); 67- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
60+ this->fText = utext_clone(this->fText, input, false, true, &status); 68+ this->fText = utext_clone(this->fText, input, false, true, &status);
61 if (U_FAILURE(status)) { 69 if (U_FAILURE(status)) {
62 return *this; 70 return *this;
63 } 71 }
File Added: pkgsrc/lang/php73/patches/Attic/patch-ext_intl_breakiterator_codepointiterator__internal.h
$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;