From c47ac8d56288713b5b846991a643db0ccf5fd974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 17 Aug 2024 14:02:39 +0200 Subject: [PATCH] [dev-lang/php] use original patch --- ...u75.patch => intl-icu-75.1-php7.4-8.1.patch} | 17 ++++++++++++++--- dev-lang/php/php-7.4.33-r7.ebuild | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) rename dev-lang/php/files/{icu75.patch => intl-icu-75.1-php7.4-8.1.patch} (57%) diff --git a/dev-lang/php/files/icu75.patch b/dev-lang/php/files/intl-icu-75.1-php7.4-8.1.patch similarity index 57% rename from dev-lang/php/files/icu75.patch rename to dev-lang/php/files/intl-icu-75.1-php7.4-8.1.patch index ef152e7..fb48d80 100644 --- a/dev-lang/php/files/icu75.patch +++ b/dev-lang/php/files/intl-icu-75.1-php7.4-8.1.patch @@ -1,7 +1,18 @@ -https://github.com/FreeBSD/freebsd-ports/commit/e680bd98d34a86302db434c5be23d0cf9d23df23 -https://github.com/php/php-src/commit/037855fcd3f2 +From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Sat, 17 Feb 2024 21:38:21 +0000 +Subject: [PATCH] ext/intl: level up c++ runtime std for icu 74 and onwards. ---- a/ext/intl/config.m4.orig 2024-04-09 18:46:23 UTC +to align with what is required to build icu 74 itself. + +Close GH-14002 +--- + ext/intl/config.m4 | 11 ++++++++++- + 1 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 +index dd687bcd97de3..48f5147ca7bbf 100644 +--- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then breakiterator/codepointiterator_methods.cpp" diff --git a/dev-lang/php/php-7.4.33-r7.ebuild b/dev-lang/php/php-7.4.33-r7.ebuild index e44a2e4..9953639 100644 --- a/dev-lang/php/php-7.4.33-r7.ebuild +++ b/dev-lang/php/php-7.4.33-r7.ebuild @@ -146,7 +146,7 @@ PHP_MV="$(ver_cut 1)" PATCHES=( "${FILESDIR}"/php-iodbc-header-location.patch "${FILESDIR}"/bug81656-gcc-11.patch - "${FILESDIR}"/icu75.patch + "${FILESDIR}"/intl-icu-75.1-php7.4-8.1.patch ) php_install_ini() {