diff options
Diffstat (limited to 'dev-lang/php/files/php-icu-70.patch')
-rw-r--r-- | dev-lang/php/files/php-icu-70.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/dev-lang/php/files/php-icu-70.patch b/dev-lang/php/files/php-icu-70.patch deleted file mode 100644 index 63bcb8533f7a..000000000000 --- a/dev-lang/php/files/php-icu-70.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c -index 1c4ba327bd83..1bdfb27b7e2e 100644 ---- a/ext/intl/locale/locale_methods.c -+++ b/ext/intl/locale/locale_methods.c -@@ -1326,7 +1326,7 @@ PHP_FUNCTION(locale_filter_matches) - if( token && (token==cur_lang_tag) ){ - /* check if the char. after match is SEPARATOR */ - chrcheck = token + (strlen(cur_loc_range)); -- if( isIDSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){ -+ if( isIDSeparator(*chrcheck) || isKeywordSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){ - efree( cur_lang_tag ); - efree( cur_loc_range ); - if( can_lang_tag){ -diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp -index bf44678efc06..143c181590e9 100644 ---- a/ext/intl/breakiterator/codepointiterator_internal.cpp -+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp -@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator() - 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; -diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h -index 7ecf12deb5ae..0baf607782d0 100644 ---- a/ext/intl/breakiterator/codepointiterator_internal.h -+++ b/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; - |