<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/11ed273296f26a9b3086e05c5c3eee9b9f3ba1fb">https://github.com/macports/macports-ports/commit/11ed273296f26a9b3086e05c5c3eee9b9f3ba1fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11ed273296f26a9b3086e05c5c3eee9b9f3ba1fb
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Mar 3 17:06:33 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.3
</span>---
lang/php/Portfile | 82 +++++++++++++++++-----------------
lang/php/files/patch-php83-atomic.diff | 8 ++--
lang/php/files/patch-php83-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 92ae386c58c..243676986e4 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.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.3
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1c2e72daf36f269cb8835a5b0223cc1e43964e6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12440200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 732d3fcc241400ec47cb4b12ca16d96d216960eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0a996276fe21fe9ca8f993314c8bc02750f464c7b0343f056fb0894a8dfa9d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12463880
</span> }
8.4 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -449,7 +449,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -610,7 +610,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -674,7 +674,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -718,7 +718,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -791,7 +791,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -815,7 +815,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -855,7 +855,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -891,7 +891,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -944,7 +944,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -961,7 +961,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -993,7 +993,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1031,7 +1031,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.27 {revision 1}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append graphics
<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]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.3]} {
</span> patchfiles-append patch-${php}-ext-gd.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1105,7 +1105,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1135,7 +1135,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1170,7 +1170,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1200,7 +1200,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1241,7 +1241,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 1}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1304,7 +1304,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1330,7 +1330,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1370,7 +1370,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1461,7 +1461,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1657,7 +1657,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1721,7 +1721,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1777,7 +1777,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1834,7 +1834,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1876,7 +1876,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1909,7 +1909,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1936,7 +1936,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2082,7 +2082,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2112,7 +2112,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2142,7 +2142,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2175,7 +2175,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2195,7 +2195,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 1}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2234,7 +2234,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2286,7 +2286,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2391,7 +2391,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.15 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-atomic.diff b/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e623b889f36..0bec0ecb7b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php83-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 07:07:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Zend/zend_atomic.h 2023-10-01 23:27:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.h.orig 2024-02-13 09:41:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.h 2024-03-03 17:16:17.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-php83-ext-gd.diff b/lang/php/files/patch-php83-ext-gd.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 181412c40df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-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;'>-@@ -2677,8 +2677,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;'>-@@ -2746,8 +2746,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>