git: db20fbad5ead - 2025Q3 - misc/patchutils: Fix build with LLVM 19

The branch 2025Q3 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db20fbad5ead36180cae5c237fd161375952bf72

commit db20fbad5ead36180cae5c237fd161375952bf72
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-09-11 20:09:05 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-09-11 20:11:01 +0000

    misc/patchutils: Fix build with LLVM 19
    
    Fix build on 16-CURRENT and 15-STABLE with LLVM 19
    
    (cherry picked from commit 40a4c19f7da23156e98b6b4bbd24c0b1cc0bf1dd)
---
 misc/patchutils/files/patch-src_interdiff.c | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/misc/patchutils/files/patch-src_interdiff.c b/misc/patchutils/files/patch-src_interdiff.c
new file mode 100644
index 000000000000..bea783320fa6
--- /dev/null
+++ b/misc/patchutils/files/patch-src_interdiff.c
@@ -0,0 +1,38 @@
+--- src/interdiff.c.orig	2025-08-22 00:37:41.000000000 -0700
++++ src/interdiff.c	2025-09-11 13:06:21.163966000 -0700
+@@ -832,9 +832,9 @@
+ 
+ 	fflush (NULL);
+ 	char *argv[2 + num_diff_opts + 2 + 1];
+-	memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
++	memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
+ 	memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
+-	memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *));
++	memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *));
+ 	in = xpipe (DIFF, &child, "r", argv);
+ 
+ 	/* Eat the first line */
+@@ -1194,9 +1194,9 @@
+ 	fflush (NULL);
+ 
+ 	char *argv[2 + num_diff_opts + 2 + 1];
+-	memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
++	memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
+ 	memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
+-	memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *));
++	memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *));
+ 	in = xpipe (DIFF, &child, "r", argv);
+ 
+ 	/* Eat the first line */
+@@ -1613,9 +1613,9 @@
+ 		sprintf (options, "-U%d", max_context);
+ 
+ 	char *argv[2 + num_diff_opts + 2 + 1];
+-	memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
++	memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
+ 	memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
+-	memcpy (argv + 2 + num_diff_opts, (const char *[]) { f1, f2, NULL }, (2 + 1) * sizeof (char *));
++	memcpy (argv + 2 + num_diff_opts, ((const char *[]) { f1, f2, NULL }), (2 + 1) * sizeof (char *));
+ 	if (debug) {
+ 		fputs ("+", stdout);
+ 		for (int i = 0; argv[i]; i++) {