<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c97cc7f3fb03dff5e0507c6512f888235ffc80e">https://github.com/macports/macports-ports/commit/6c97cc7f3fb03dff5e0507c6512f888235ffc80e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6c97cc7f3fb03dff5e0507c6512f888235ffc80e
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 3 03:27:36 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.11
</span>---
lang/php/Portfile | 84 +++++++++++-----------
...php83-conditional-Wno-implicit-fallthrough.diff | 45 ------------
lang/php/files/patch-php83-opcache.diff | 23 ------
3 files changed, 42 insertions(+), 110 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 742c997061d..bfe5f41db75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,11 +186,11 @@ switch ${subport_branch} {
</span> }
8.3 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.11
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 dd591f66a4c52705c245dc8cd60b2842f578fb6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a0f2179d00931fe7631a12cbc3428f898ca3d99fe564260c115af381d2a1978d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12484660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 703463b496d5df4692253f3efa2d9c3311deffb5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12481420
</span> }
8.4 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +278,7 @@ if {[is_sapi_subport]} {
</span> patch-${php}-libxml2-2.12.diff
}
if {[vercmp ${branch} >= 8.0]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} < 8.4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} < 8.3]} {
</span> patchfiles-append \
patch-${php}-conditional-Wno-implicit-fallthrough.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -472,7 +472,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,7 +634,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -699,7 +699,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -744,7 +744,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -818,7 +818,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -843,7 +843,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -884,7 +884,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -921,7 +921,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 1}
8.1.29 {revision 1}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -977,7 +977,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -995,7 +995,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1028,7 +1028,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1067,7 +1067,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1142,7 +1142,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1173,7 +1173,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1209,7 +1209,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1241,7 +1241,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1284,7 +1284,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 1}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1348,7 +1348,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1375,7 +1375,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1416,7 +1416,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1508,7 +1508,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1741,7 +1741,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1806,7 +1806,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1838,7 +1838,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> legacysupport.newest_darwin_requires_legacy 15
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.3]} {
</span> patchfiles-append patch-${php}-opcache.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1867,7 +1867,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1926,7 +1926,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1970,7 +1970,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2004,7 +2004,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2032,7 +2032,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2096,7 +2096,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2128,7 +2128,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2159,7 +2159,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2198,7 +2198,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2219,7 +2219,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 1}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2259,7 +2259,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2312,7 +2312,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2418,7 +2418,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.10 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.11 {revision 0}
</span> 8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ac024bbcd3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/date/config0.m4 2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/date/config0.m4 2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS(strtoll atoll)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/hash/config.m4 2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/hash/config.m4 2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,8 +24,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/pcre/config0.m4 2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/pcre/config0.m4 2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-opcache.diff b/lang/php/files/patch-php83-opcache.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ebe0c52a5f2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/opcache/config.m4.orig 2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/opcache/config.m4 2024-04-16 05:58:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,6 +300,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT([$have_shm_mmap_posix])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_NEW_EXTENSION(opcache,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZendAccelerator.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zend_accelerator_blacklist.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_alloc_mmap.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_alloc_posix.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ZEND_JIT_SRC,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shared,,"$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ADD_EXTENSION_DEP(opcache, pcre)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>