diff --git a/packages/php/build.sh b/packages/php/build.sh index f71786d35..551d60304 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" TERMUX_PKG_LICENSE="PHP-3.01" TERMUX_PKG_LICENSE_FILE=LICENSE TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=8.0.12 +TERMUX_PKG_VERSION=8.0.13 TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=889cfbd76ffdde521ac093605e17dacb34cc0734b2bbedd466ee00d224746b6c +TERMUX_PKG_SHA256=ee1369199b26fc088ce6f51c111be0fbb42d1b10b107437c782a4701c0ea673f # Build native php for phar to build (see pear-Makefile.frag.patch): TERMUX_PKG_HOSTBUILD=true # Build the native php without xml support as we only need phar: diff --git a/packages/php/icu-70.patch b/packages/php/icu-70.patch deleted file mode 100644 index 0b8b69fef..000000000 --- a/packages/php/icu-70.patch +++ /dev/null @@ -1,52 +0,0 @@ -From https://bugs.php.net/patch-display.php?bug_id=81572&patch=icu70betterpatch&revision=1635621664&download=1 - -diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp -index 71ba056994..b00e5b4ef5 100644 ---- a/ext/intl/breakiterator/codepointiterator_internal.cpp -+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp -@@ -14,6 +14,7 @@ - - #include "codepointiterator_internal.h" - #include -+#include - #include - - #include "php.h" -@@ -73,7 +74,11 @@ CodePointBreakIterator::~CodePointBreakIterator() - clearCurrentCharIter(); - } - --UBool CodePointBreakIterator::operator==(const BreakIterator& that) const -+#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 43ec79d0b7..334981f96f 100644 ---- a/ext/intl/breakiterator/codepointiterator_internal.h -+++ b/ext/intl/breakiterator/codepointiterator_internal.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - using icu::BreakIterator; - using icu::CharacterIterator; -@@ -37,8 +38,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; - - virtual UClassID getDynamicClassID(void) const;