From 0d79d4ba6953b2ae93d8576ddec40fe2e7269685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 17 Aug 2024 03:13:02 +0200 Subject: [PATCH] [dev-lang/php] rebase (macos only patches) add icu75 from freebsd --- dev-lang/php/Manifest | 2 +- dev-lang/php/files/icu75.patch | 23 +++++++++++++++++++++++ dev-lang/php/php-7.4.33-r7.ebuild | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dev-lang/php/files/icu75.patch diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 4931282..b5d7f2d 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1 +1 @@ -DIST php-7.4.33.tar.gz 14928613 BLAKE2B 746dfbbc509085a462112630101645de755339b12e399d55a3b040f755449fbbd8c4df0a05bd83c7918aa45d7bb4ac2ca00327a7a46939244d7057dbb9514472 SHA512 5be24d39f1c8f53a1ddf47b03a9a70b93f0f3fb72cd17b44879878587c540665e45088ec6c59bb7b1dc6273b87b23815e6918c05fab8c858ad9f8b7155631efe +DIST php-7.4.33.tar.gz 14929954 BLAKE2B 8d2b9baf445b8f08a7dab813fb74510d97ade3688d94ac89df846c1fd6417833387a68633e035b45df6983a3c4b6a4fe816e200457b9dd51303caea45725d76d SHA512 b7b138cdfeffe32e263ad29482a5dcb40a06bd2c0036f6fadde37c3bdb02e2c532c21a2f7a04024c7a7ebe94a8d6b4ad64bb2141f048c98dd8cde79d77a8b16e diff --git a/dev-lang/php/files/icu75.patch b/dev-lang/php/files/icu75.patch new file mode 100644 index 0000000..ef152e7 --- /dev/null +++ b/dev-lang/php/files/icu75.patch @@ -0,0 +1,23 @@ +https://github.com/FreeBSD/freebsd-ports/commit/e680bd98d34a86302db434c5be23d0cf9d23df23 +https://github.com/php/php-src/commit/037855fcd3f2 + +--- a/ext/intl/config.m4.orig 2024-04-09 18:46:23 UTC ++++ 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" diff --git a/dev-lang/php/php-7.4.33-r7.ebuild b/dev-lang/php/php-7.4.33-r7.ebuild index 6c12b65..e44a2e4 100644 --- a/dev-lang/php/php-7.4.33-r7.ebuild +++ b/dev-lang/php/php-7.4.33-r7.ebuild @@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)" PATCHES=( "${FILESDIR}"/php-iodbc-header-location.patch "${FILESDIR}"/bug81656-gcc-11.patch + "${FILESDIR}"/icu75.patch ) php_install_ini() {