diff options
| author | Hirokazu MORIKAWA <morikw2@gmail.com> | 2021-11-02 09:28:45 +0900 |
|---|---|---|
| committer | Hirokazu MORIKAWA <morikw2@gmail.com> | 2021-11-02 09:28:45 +0900 |
| commit | 4da149b68a10e121eb0ef5c19d2d18020828ec24 (patch) | |
| tree | 2a98a5035b63e09fc600f6c247bc27a948c54914 /lang/php8 | |
| parent | 078a71d3d0202289f25873fd2bbae9f0960400e0 (diff) | |
php8: Support for icu 70.1
This PR prepares PHP for a few minor changes that cause PHP builds to fail when using --enable-intl with ICU 70.1.
Change UBool to bool for equality operators in ICU >= 70.1
https://github.com/php/php-src/pull/7596
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Diffstat (limited to 'lang/php8')
| -rw-r--r-- | lang/php8/Makefile | 2 | ||||
| -rw-r--r-- | lang/php8/patches/1011-Accommodate-changes-to-canonicalized-forms-in-ICU-70_1.patch | 53 |
2 files changed, 54 insertions, 1 deletions
diff --git a/lang/php8/Makefile b/lang/php8/Makefile index b15c633a8..cf95b5e47 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=8.0.12 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> PKG_LICENSE:=PHP-3.01 diff --git a/lang/php8/patches/1011-Accommodate-changes-to-canonicalized-forms-in-ICU-70_1.patch b/lang/php8/patches/1011-Accommodate-changes-to-canonicalized-forms-in-ICU-70_1.patch new file mode 100644 index 000000000..9c376c72b --- /dev/null +++ b/lang/php8/patches/1011-Accommodate-changes-to-canonicalized-forms-in-ICU-70_1.patch @@ -0,0 +1,53 @@ +From cd1447a6962496fca60a2f5e5d9cf4448575cc24 Mon Sep 17 00:00:00 2001 +From: Ben Ramsey <ramsey@php.net> +Date: Tue, 19 Oct 2021 23:59:11 -0500 +Subject: [PATCH 1/4] Change UBool to bool for equality operators in ICU >= + 70.1 + +Refer to: +- https://github.com/unicode-org/icu/commit/633438f8da99fee815e2c61626ea779a84567a3d +- https://github.com/unicode-org/icu/commit/f6325d49ba57ec26f320b2865ce09ca47db458d9 +--- + ext/intl/breakiterator/codepointiterator_internal.cpp | 4 ++++ + ext/intl/breakiterator/codepointiterator_internal.h | 4 ++++ + 2 files changed, 8 insertions(+) + +--- a/ext/intl/breakiterator/codepointiterator_internal.cpp ++++ b/ext/intl/breakiterator/codepointiterator_internal.cpp +@@ -73,7 +73,11 @@ 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; +--- a/ext/intl/breakiterator/codepointiterator_internal.h ++++ b/ext/intl/breakiterator/codepointiterator_internal.h +@@ -37,7 +37,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; + +--- a/ext/intl/locale/locale_methods.c ++++ b/ext/intl/locale/locale_methods.c +@@ -1239,7 +1239,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){ |