From 9f5c2d296d6e93332064230f89b936d762b3756f Mon Sep 17 00:00:00 2001
From: Laszlo Valko <valko@linux.karinthy.hu>
Date: Sat, 21 Dec 2024 19:20:23 +0100
Subject: [PATCH] Added intl patch to php-7.4.33-r5.

---
 dev-lang/php/Manifest                         |  3 ++-
 .../php/files/php-7.4.33-gcc14-intl.patch     | 21 +++++++++++++++++++
 dev-lang/php/php-7.4.33-r5.ebuild             |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 dev-lang/php/files/php-7.4.33-gcc14-intl.patch

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d3ce3d8..2db3ccf 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,6 +4,7 @@ AUX php-7.4.33-CVE-2022-31631.patch 1836 BLAKE2B 63a250c6ec5c1b3608f5e2b61118d89
 AUX php-7.4.33-CVE-2023-0567.patch 2780 BLAKE2B a35b8f7d24cfb8a325f65e465bd440930876f4b188d1ea5c12d616da39ec75809c13f9e37d08dc5245c7412f21899018f867681ecf89213fc5e7a1b01cb0dd41 SHA512 cdbbe235791027b804c8bbc71a203f954628cbf27af99be34c750dab3c8bf8e3928af87adb87ffe09b2d011c19ed5b339e345d5a55a7053fc82d4c72ba08e8b7
 AUX php-7.4.33-CVE-2023-0568.patch 1327 BLAKE2B ab7ad1f83bfeef8da091f159d41371d0f89e3dbcb79c1b7bec7bb76b329c60d2d10e0c6ef9c5c959a57846466a778345e697099e5c2a9555733918cc2faf41f4 SHA512 6015f6025e4e5e29aa699ef9a4b4b28a8f756cca0e83a4e2311c1735f25ef89395d4ea2c143ec45b375128f66b99a4b788e8bfb28d9ee74566345696a1a3c2f0
 AUX php-7.4.33-CVE-2023-0662.patch 1992 BLAKE2B d436b763a0131c1992e69821df1f8c5d7cfdc151c9470671189dd76acdf295d3108030a273d2c3314bf97c0e06a286541a64312a95d6b9bdea0c912a90db7e0d SHA512 71cda55f019b7dd3d74c598dc93e81674bf6954bee4fb37c325ca4b8449b6a1340d61ccd1f9b9f0ba86b9cb3069221614f9b50a01de674c157bf47d7906e25a7
+AUX php-7.4.33-gcc14-intl.patch 842 BLAKE2B 0a37eeec3ebcb0bacb4ab42219181926e4f4c07fc65b2cee8d153d93e797084a7c69882013b284b45ba8e7d84982dd26d46139678c17d893e8bf055d8973d710 SHA512 3f91bc8a6e7f9fc5dab84fbdbf07fa0af14f3433ebd2a2a8f15c0379c4bfd796336b456713e3cd87ecfbdd18d429d4b95da74a0831e02a02fa2f7057dff719ec
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-icu-70.patch 1833 BLAKE2B f184d3ae52c6fc25329cbcd01abda2680739ebe29d1b4a97a3aaf6697b4dff385bdf423a4e41571ca534a57e35797a017c4bb507ce74db7f0a26455f90869e40 SHA512 f820320784ab7c99c23ac563b4908f33b6407204ad0486611e3471d7576477c016928534bb396587558061bc5d98e2deab4ad99e49b6c2746bfd06de729c7ae7
@@ -13,5 +14,5 @@ DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd6
 DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-patches-7.1.33bp.tar.bz2 39945 BLAKE2B 9f7137f61b7ea07cc263b054401a319042f5a40d6cdaf3561a45778ae009e3279c72f2a6a0f9c97805bc39acef1c8c9d72d290c2ce873f44209fb2d65d620810 SHA512 8e36fb57bdadfcc4e976ecb7dc8f44290dc3b507eb27f4445aa2c8eba528e7cb53286e7fd9b1b9141f12fd6e29278282e4f0eb6445ed06046dd48a1d5d1bc789
 EBUILD php-5.6.40-r7.ebuild 23052 BLAKE2B efae1bac77032cf232968852748a5f679bab9909c481ca5df81660740312597d8b78355daa729cc9196341c7b2078b0fa53d389b8ef9a35abb54d86e7d823dd7 SHA512 e6d5702b8011985a73cc906a5d65e6b636da34e85795d6f4c4649d1a2bc3f3c9f2797e0366aa63f9c82a7b5b3fa265193213dfc37a607bbf7d20129f7e0ee43f
-EBUILD php-7.4.33-r5.ebuild 21533 BLAKE2B 2246f60ecb54284555e74ac458551729e9a98000c21c5200df2db511e35429c907f0e1a22fa1fccaab2a99215ab8ee40e17c29843d2a703e0e50745b2ed828a2 SHA512 03bb839e682daa74e1a1cca3ae0843ea61e7b57836302e2726710b5ab2dcf11862e52c5b8012dd6178607d7f62343116e75e5e0d243b29631b76e0570faa7456
+EBUILD php-7.4.33-r5.ebuild 21583 BLAKE2B 183288ed287220d94fff7c55805e5683b37fad6f04bdcb22a8ab5e0d10fa32454538f7fd2374293eeb4ce2d3cf6ee3d186833db30bf7985738056f03ae4857b0 SHA512 8178b4c9b5bee11d915e69489bb3a3551e6aa9d97f81fd5251e7c194fdca78c83b50cee203a2274a322c0b5b96801594a505a64111c966776ec4bdf2a410903e
 MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86
diff --git a/dev-lang/php/files/php-7.4.33-gcc14-intl.patch b/dev-lang/php/files/php-7.4.33-gcc14-intl.patch
new file mode 100644
index 0000000..576d732
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-gcc14-intl.patch
@@ -0,0 +1,21 @@
+diff '--color=auto' -Naur php.orig/ext/intl/config.m4 php.new/ext/intl/config.m4
+--- a/ext/intl/config.m4	2022-10-31 11:36:14.000000000 +0100
++++ b/ext/intl/config.m4	2024-12-21 19:16:00.921035577 +0100
+@@ -83,7 +83,16 @@
+     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([$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"
+   if test "$ext_shared" = "no"; then
+     PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
diff --git a/dev-lang/php/php-7.4.33-r5.ebuild b/dev-lang/php/php-7.4.33-r5.ebuild
index f59fb33..ebcf80b 100644
--- a/dev-lang/php/php-7.4.33-r5.ebuild
+++ b/dev-lang/php/php-7.4.33-r5.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
 	"${FILESDIR}"/php-7.4.33-CVE-2023-0567.patch
 	"${FILESDIR}"/php-7.4.33-CVE-2023-0568.patch
 	"${FILESDIR}"/php-7.4.33-CVE-2023-0662.patch
+        "${FILESDIR}"/php-7.4.33-gcc14-intl.patch
 )
 
 php_install_ini() {