From: Michael Heimpold <mhei@heimpold.de>
Date: Tue, 14 May 2024 18:57:23 +0000 (+0200)
Subject: php8: update to 8.3.7
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=533456bcc07164fade4b7290a4b3b8869f82dc50;p=feed%2Fpackages.git

php8: update to 8.3.7

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/lang/php8/Makefile b/lang/php8/Makefile
index f3a805bbdf..9239d9d398 100644
--- a/lang/php8/Makefile
+++ b/lang/php8/Makefile
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=8.3.6
-PKG_RELEASE:=2
+PKG_VERSION:=8.3.7
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=PHP-3.01
@@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.php.net/distributions/
-PKG_HASH:=53c8386b2123af97626d3438b3e4058e0c5914cb74b048a6676c57ac647f5eae
+PKG_HASH:=d53433c1ca6b2c8741afa7c524272e6806c1e895e5912a058494fea89988570a
 
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16
diff --git a/lang/php8/patches/1020-php-intl_unbreak_build_with_ICU_75.patch b/lang/php8/patches/1020-php-intl_unbreak_build_with_ICU_75.patch
deleted file mode 100644
index 0f118e4da2..0000000000
--- a/lang/php8/patches/1020-php-intl_unbreak_build_with_ICU_75.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e680bd98d34a86302db434c5be23d0cf9d23df23 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 20 Apr 2024 23:49:22 +0200
-Subject: devel/php*-intl: unbreak build with ICU 75
-
-In file included from ext/intl/intl_convertcpp.cpp:17:
-In file included from ./intl_convertcpp.h:22:
-In file included from /usr/local/include/unicode/unistr.h:39:
-/usr/local/include/unicode/stringpiece.h:133:29: error: no template named 'enable_if_t' in namespace 'std'
-            typename = std::enable_if_t<
-                       ~~~~~^
-/usr/local/include/unicode/stringpiece.h:134:23: error: no template named 'is_same_v' in namespace 'std'; did you mean 'is_same'?
-                (std::is_same_v<decltype(T().data()), const char*>
-                 ~~~~~^
-/usr/include/c++/v1/__type_traits/is_same.h:22:29: note: 'is_same' declared here
-struct _LIBCPP_TEMPLATE_VIS is_same : _BoolConstant<__is_same(_Tp, _Up)> { };
-                            ^
-In file included from ext/intl/intl_convertcpp.cpp:17:
-In file included from ./intl_convertcpp.h:22:
-In file included from /usr/local/include/unicode/unistr.h:39:
-/usr/local/include/unicode/stringpiece.h:139:17: error: use of address-of-label extension outside of a function body
-                std::is_same_v<decltype(T().size()), size_t>>>
-                ^
-/usr/local/include/unicode/stringpiece.h:139:62: error: expected member name or ';' after declaration specifiers
-                std::is_same_v<decltype(T().size()), size_t>>>
-                                                             ^
-PR:		278420
-Reported by:	antoine (via exp-run)
----
-
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/codepointiterator_methods.cpp"
- 
-   PHP_REQUIRE_CXX()
--  PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+
-+  AC_MSG_CHECKING([if intl requires -std=gnu++17])
-+  AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[
-+    AC_MSG_RESULT([yes])
-+    PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
-+  ],[
-+    AC_MSG_RESULT([no])
-+    PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+  ])
-+
-   PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
-   case $host_alias in
-   *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"