<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/000f105e5d5761fb540eef8b44d727819890dae6">https://github.com/macports/macports-ports/commit/000f105e5d5761fb540eef8b44d727819890dae6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 000f105e5d5761fb540eef8b44d727819890dae6
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Mar 4 02:44:03 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> php81-gd: Fix the imagefontwidth/imagefontheight fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69045
</span>---
lang/php/Portfile | 2 +-
lang/php/files/patch-php81-ext-gd.diff | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 6 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 206861d7a70..c53d541822a 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;'>@@ -1029,7 +1029,7 @@ subport ${php}-gd {
</span> 7.3.33 {revision 0}
7.4.33 {revision 0}
8.0.30 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.1.27 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.27 {revision 2}
</span> 8.2.16 {revision 0}
8.3.3 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-ext-gd.diff b/lang/php/files/patch-php81-ext-gd.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f40f94ab906..6c555098db0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php81-ext-gd.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php81-ext-gd.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,9 @@ proper GdFont class leads to a subtle bug when attempting to use via the
</span> imagefont* function.
https://github.com/php/php-src/issues/13082
https://github.com/php/php-src/commit/1e464e5b55f81b7fb9476a55f481fe1d2a25d6d9
<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:#e0ffe0;'>+https://github.com/php/php-src/commit/df85c2556e2217c1bec0fa371f58e20266ffbb28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/gd/gd.c.orig 2023-12-19 14:35:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/gd/gd.c 2024-03-04 02:40:36.000000000 -0600
</span> @@ -2831,8 +2831,8 @@
*/
static void php_imagefontsize(INTERNAL_FUNCTION_PARAMETERS, int arg)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,14 +18,24 @@ https://github.com/php/php-src/commit/1e464e5b55f81b7fb9476a55f481fe1d2a25d6d9
</span> gdFontPtr font;
ZEND_PARSE_PARAMETERS_START(1, 1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2900,8 +2900,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2899,9 +2899,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdImagePtr im;
</span> int ch = 0, col, x, y, i, l = 0;
unsigned char *str = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- zend_object *font_obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zend_object *font_obj;
</span> - zend_long font_int;
- gdFontPtr font;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_object *font_obj = NULL;
</span> + zend_long font_int = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdFontPtr font = NULL;
</span>
ZEND_PARSE_PARAMETERS_START(6, 6)
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2926,7 +2925,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y = Y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x = X;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- font = php_find_gd_font(font_obj, font_int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gdFontPtr font = php_find_gd_font(font_obj, font_int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (mode) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0:
</span></pre><pre style='margin:0'>
</pre>