| 1 |
commit: 91dcbea9e37241ce74bf5613ccbe3cfca5b23429 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 24 14:14:27 2021 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 24 14:14:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dcbea9 |
| 7 |
|
| 8 |
dev-lang/php: Backport patch from upstream for ICU 70 changes |
| 9 |
|
| 10 |
Already fixed in 7.4.26, 8.0.13 and 8.1.0_rc6 |
| 11 |
|
| 12 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-lang/php/files/php-icu-70.patch | 45 +++++++++++++++++++++++++++++++++++++ |
| 15 |
dev-lang/php/php-7.3.32.ebuild | 1 + |
| 16 |
dev-lang/php/php-7.3.33.ebuild | 1 + |
| 17 |
dev-lang/php/php-7.4.25.ebuild | 1 + |
| 18 |
dev-lang/php/php-8.0.12.ebuild | 1 + |
| 19 |
dev-lang/php/php-8.1.0_rc5.ebuild | 1 + |
| 20 |
6 files changed, 50 insertions(+) |
| 21 |
|
| 22 |
diff --git a/dev-lang/php/files/php-icu-70.patch b/dev-lang/php/files/php-icu-70.patch |
| 23 |
new file mode 100644 |
| 24 |
index 000000000000..63bcb8533f7a |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-lang/php/files/php-icu-70.patch |
| 27 |
@@ -0,0 +1,45 @@ |
| 28 |
+diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c |
| 29 |
+index 1c4ba327bd83..1bdfb27b7e2e 100644 |
| 30 |
+--- a/ext/intl/locale/locale_methods.c |
| 31 |
++++ b/ext/intl/locale/locale_methods.c |
| 32 |
+@@ -1326,7 +1326,7 @@ PHP_FUNCTION(locale_filter_matches) |
| 33 |
+ if( token && (token==cur_lang_tag) ){ |
| 34 |
+ /* check if the char. after match is SEPARATOR */ |
| 35 |
+ chrcheck = token + (strlen(cur_loc_range)); |
| 36 |
+- if( isIDSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){ |
| 37 |
++ if( isIDSeparator(*chrcheck) || isKeywordSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){ |
| 38 |
+ efree( cur_lang_tag ); |
| 39 |
+ efree( cur_loc_range ); |
| 40 |
+ if( can_lang_tag){ |
| 41 |
+diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp |
| 42 |
+index bf44678efc06..143c181590e9 100644 |
| 43 |
+--- a/ext/intl/breakiterator/codepointiterator_internal.cpp |
| 44 |
++++ b/ext/intl/breakiterator/codepointiterator_internal.cpp |
| 45 |
+@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator() |
| 46 |
+ clearCurrentCharIter(); |
| 47 |
+ } |
| 48 |
+ |
| 49 |
++#if U_ICU_VERSION_MAJOR_NUM >= 70 |
| 50 |
++bool CodePointBreakIterator::operator==(const BreakIterator& that) const |
| 51 |
++#else |
| 52 |
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const |
| 53 |
++#endif |
| 54 |
+ { |
| 55 |
+ if (typeid(*this) != typeid(that)) { |
| 56 |
+ return FALSE; |
| 57 |
+diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h |
| 58 |
+index 7ecf12deb5ae..0baf607782d0 100644 |
| 59 |
+--- a/ext/intl/breakiterator/codepointiterator_internal.h |
| 60 |
++++ b/ext/intl/breakiterator/codepointiterator_internal.h |
| 61 |
+@@ -39,7 +39,11 @@ namespace PHP { |
| 62 |
+ |
| 63 |
+ virtual ~CodePointBreakIterator(); |
| 64 |
+ |
| 65 |
++#if U_ICU_VERSION_MAJOR_NUM >= 70 |
| 66 |
++ virtual bool operator==(const BreakIterator& that) const; |
| 67 |
++#else |
| 68 |
+ virtual UBool operator==(const BreakIterator& that) const; |
| 69 |
++#endif |
| 70 |
+ |
| 71 |
+ virtual CodePointBreakIterator* clone(void) const; |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/dev-lang/php/php-7.3.32.ebuild b/dev-lang/php/php-7.3.32.ebuild |
| 75 |
index 80c4f1c7d3d8..eb176b40cd3d 100644 |
| 76 |
--- a/dev-lang/php/php-7.3.32.ebuild |
| 77 |
+++ b/dev-lang/php/php-7.3.32.ebuild |
| 78 |
@@ -152,6 +152,7 @@ RESTRICT="!test? ( test )" |
| 79 |
|
| 80 |
PATCHES=( |
| 81 |
"${FILESDIR}/php-freetype-2.9.1.patch" |
| 82 |
+ "${FILESDIR}/php-icu-70.patch" |
| 83 |
) |
| 84 |
|
| 85 |
PHP_MV="$(ver_cut 1)" |
| 86 |
|
| 87 |
diff --git a/dev-lang/php/php-7.3.33.ebuild b/dev-lang/php/php-7.3.33.ebuild |
| 88 |
index 0f10af29f7a5..e1ab493e57a6 100644 |
| 89 |
--- a/dev-lang/php/php-7.3.33.ebuild |
| 90 |
+++ b/dev-lang/php/php-7.3.33.ebuild |
| 91 |
@@ -152,6 +152,7 @@ RESTRICT="!test? ( test )" |
| 92 |
|
| 93 |
PATCHES=( |
| 94 |
"${FILESDIR}/php-freetype-2.9.1.patch" |
| 95 |
+ "${FILESDIR}/php-icu-70.patch" |
| 96 |
) |
| 97 |
|
| 98 |
PHP_MV="$(ver_cut 1)" |
| 99 |
|
| 100 |
diff --git a/dev-lang/php/php-7.4.25.ebuild b/dev-lang/php/php-7.4.25.ebuild |
| 101 |
index 7c74bdd02981..ea60a2d13396 100644 |
| 102 |
--- a/dev-lang/php/php-7.4.25.ebuild |
| 103 |
+++ b/dev-lang/php/php-7.4.25.ebuild |
| 104 |
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)" |
| 105 |
|
| 106 |
PATCHES=( |
| 107 |
"${FILESDIR}"/php-iodbc-header-location.patch |
| 108 |
+ "${FILESDIR}/php-icu-70.patch" |
| 109 |
) |
| 110 |
|
| 111 |
php_install_ini() { |
| 112 |
|
| 113 |
diff --git a/dev-lang/php/php-8.0.12.ebuild b/dev-lang/php/php-8.0.12.ebuild |
| 114 |
index 38aa05d3df7a..fa6e96581f24 100644 |
| 115 |
--- a/dev-lang/php/php-8.0.12.ebuild |
| 116 |
+++ b/dev-lang/php/php-8.0.12.ebuild |
| 117 |
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)" |
| 118 |
PATCHES=( |
| 119 |
"${FILESDIR}/php-iodbc-header-location.patch" |
| 120 |
"${FILESDIR}/php80-firebird-warnings.patch" |
| 121 |
+ "${FILESDIR}/php-icu-70.patch" |
| 122 |
) |
| 123 |
|
| 124 |
php_install_ini() { |
| 125 |
|
| 126 |
diff --git a/dev-lang/php/php-8.1.0_rc5.ebuild b/dev-lang/php/php-8.1.0_rc5.ebuild |
| 127 |
index 0233f090d637..7d840eb22182 100644 |
| 128 |
--- a/dev-lang/php/php-8.1.0_rc5.ebuild |
| 129 |
+++ b/dev-lang/php/php-8.1.0_rc5.ebuild |
| 130 |
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)" |
| 131 |
|
| 132 |
PATCHES=( |
| 133 |
"${FILESDIR}/php-iodbc-header-location.patch" |
| 134 |
+ "${FILESDIR}/php-icu-70.patch" |
| 135 |
) |
| 136 |
|
| 137 |
php_install_ini() { |
Archives