<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/525df7b95675898accf16e839f8f5e6ffa0b6d50">https://github.com/macports/macports-ports/commit/525df7b95675898accf16e839f8f5e6ffa0b6d50</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 525df7b95675898accf16e839f8f5e6ffa0b6d50
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Mar 3 17:08:16 2024 -0600

<span style='display:block; white-space:pre;color:#404040;'>    php82: Update to 8.2.16
</span>---
 lang/php/Portfile                      | 82 +++++++++++++++++-----------------
 lang/php/files/patch-php82-atomic.diff |  8 ++--
 lang/php/files/patch-php82-ext-gd.diff | 30 -------------
 3 files changed, 45 insertions(+), 75 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 243676986e4..206861d7a70 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;'>@@ -178,11 +178,11 @@ switch ${subport_branch} {
</span>     }
     8.2 {
         epoch           2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        version         8.2.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version         8.2.16
</span>         use_xz          yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums       rmd160  d5389dced7dee4b7252702dc3463412199b1ccf7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    12075384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums       rmd160  1b1edbd6135737ea030110f66cf6c8d40b7568ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    12085228
</span>     }
     8.3 {
         epoch           2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,7 +448,7 @@ subport ${php} {
</span>         7.4.33              {revision 1}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,7 +609,7 @@ subport ${php}-apache2handler {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -673,7 +673,7 @@ subport ${php}-cgi {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -717,7 +717,7 @@ subport ${php}-fpm {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -790,7 +790,7 @@ subport ${php}-calendar {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -814,7 +814,7 @@ subport ${php}-curl {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -854,7 +854,7 @@ subport ${php}-dba {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -890,7 +890,7 @@ subport ${php}-enchant {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -943,7 +943,7 @@ subport ${php}-exif {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -960,7 +960,7 @@ subport ${php}-ffi {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -992,7 +992,7 @@ subport ${php}-ftp {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1030,7 +1030,7 @@ subport ${php}-gd {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1059,7 +1059,7 @@ subport ${php}-gd {
</span>         depends_lib-append  port:webp
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.3]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[vercmp ${branch} == 8.1]} {
</span>         patchfiles-append       patch-${php}-ext-gd.diff
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1104,7 +1104,7 @@ subport ${php}-gettext {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1134,7 +1134,7 @@ subport ${php}-gmp {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1169,7 +1169,7 @@ subport ${php}-iconv {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1199,7 +1199,7 @@ subport ${php}-imap {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1240,7 +1240,7 @@ subport ${php}-intl {
</span>         7.4.33              {revision 2}
         8.0.30              {revision 1}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1303,7 +1303,7 @@ subport ${php}-ipc {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1329,7 +1329,7 @@ subport ${php}-ldap {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1369,7 +1369,7 @@ subport ${php}-mbstring {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1460,7 +1460,7 @@ subport ${php}-mysql {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1656,7 +1656,7 @@ subport ${php}-odbc {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1720,7 +1720,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span>             7.4.33              {revision 0}
             8.0.30              {revision 0}
             8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8.2.16              {revision 0}
</span>             8.3.3               {revision 0}
         }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1776,7 +1776,7 @@ subport ${php}-openssl {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1833,7 +1833,7 @@ subport ${php}-oracle {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1875,7 +1875,7 @@ subport ${php}-pcntl {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1908,7 +1908,7 @@ subport ${php}-posix {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1935,7 +1935,7 @@ subport ${php}-postgresql {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2081,7 +2081,7 @@ subport ${php}-pspell {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2111,7 +2111,7 @@ subport ${php}-snmp {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2141,7 +2141,7 @@ subport ${php}-soap {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2174,7 +2174,7 @@ subport ${php}-sockets {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2194,7 +2194,7 @@ subport ${php}-sodium {
</span>         7.4.33              {revision 1}
         8.0.30              {revision 1}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2233,7 +2233,7 @@ subport ${php}-sqlite {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2285,7 +2285,7 @@ subport ${php}-tidy {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2390,7 +2390,7 @@ subport ${php}-xsl {
</span>         7.4.33              {revision 0}
         8.0.30              {revision 0}
         8.1.27              {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        8.2.15              {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8.2.16              {revision 0}
</span>         8.3.3               {revision 0}
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-atomic.diff b/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4c58933f04..2d68a390a2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,14 @@ error: address argument to atomic operation must be a pointer to non-const _Atom
</span> 
 https://github.com/php/php-src/issues/8881
 https://github.com/php/php-src/pull/11931
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Zend/zend_atomic.h.orig   2023-09-26 06:11:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Zend/zend_atomic.h   2023-10-02 01:59:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.h.orig      2024-02-13 09:22:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.h   2024-03-03 17:14:09.000000000 -0600
</span> @@ -23,7 +23,7 @@
        ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
  
  /* Builtins are used to avoid library linkage */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __has_feature(c_atomic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __has_feature(c_atomic) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __has_feature(c_atomic) && defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __has_feature(c_atomic) && defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
</span>  #define  HAVE_C11_ATOMICS 1
  #elif ZEND_GCC_PREREQ(4, 7)
  #define       HAVE_GNUC_ATOMICS 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-ext-gd.diff b/lang/php/files/patch-php82-ext-gd.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a320975ec3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-ext-gd.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix issue which occurs when compiling with recent clang releases (>= 14) and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with the '-Os' optimisation level, after using `imageloadfont` which returns a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proper GdFont class leads to a subtle bug when attempting to use via the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-imagefont* function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/13082
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/commit/1e464e5b55f81b7fb9476a55f481fe1d2a25d6d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/gd/gd.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/gd/gd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2681,8 +2681,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void php_imagefontsize(INTERNAL_FUNCTION_PARAMETERS, int arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  zend_object *font_obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  zend_long font_int;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  zend_object *font_obj = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  zend_long font_int = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   gdFontPtr font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ZEND_PARSE_PARAMETERS_START(1, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2750,8 +2750,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   int ch = 0, col, x, y, i, l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   unsigned char *str = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   zend_object *font_obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  zend_long font_int;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  gdFontPtr font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  zend_long font_int = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  gdFontPtr font = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ZEND_PARSE_PARAMETERS_START(6, 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
</span></pre><pre style='margin:0'>

</pre>