CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct  7 14:42:20 UTC 2025

Modified Files:
        pkgsrc/converters/php-iconv: Makefile
        pkgsrc/lang/php84: distinfo
Added Files:
        pkgsrc/lang/php84/patches: patch-ext_iconv_iconv.c

Log Message:
php-iconv: fix build with gcc 14

With help from taca@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/converters/php-iconv/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php84/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php84/patches/patch-ext_iconv_iconv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/php-iconv/Makefile
diff -u pkgsrc/converters/php-iconv/Makefile:1.18 pkgsrc/converters/php-iconv/Makefile:1.19
--- pkgsrc/converters/php-iconv/Makefile:1.18   Sat Feb  8 03:06:01 2025
+++ pkgsrc/converters/php-iconv/Makefile        Tue Oct  7 14:42:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2025/02/08 03:06:01 taca Exp $
+# $NetBSD: Makefile,v 1.19 2025/10/07 14:42:20 wiz Exp $
 
 MODNAME=               iconv
 PKGREVISION=           2
@@ -13,6 +13,8 @@ PLIST_SRC+=           ${.CURDIR}/PLIST
 
 TEST_TARGET=           test
 
+USE_PHP_EXT_PATCHES=   yes
+
 CHECK_BUILTIN.iconv:=  yes
 .include "../../converters/libiconv/builtin.mk"
 CHECK_BUILTIN.iconv:=  no

Index: pkgsrc/lang/php84/distinfo
diff -u pkgsrc/lang/php84/distinfo:1.12 pkgsrc/lang/php84/distinfo:1.13
--- pkgsrc/lang/php84/distinfo:1.12     Fri Sep 26 13:51:38 2025
+++ pkgsrc/lang/php84/distinfo  Tue Oct  7 14:42:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2025/09/26 13:51:38 taca Exp $
+$NetBSD: distinfo,v 1.13 2025/10/07 14:42:20 wiz Exp $
 
 BLAKE2s (php-8.4.13.tar.xz) = a060e7a48735706ba60d1a645f9bfe7393001bfffba4d97a1d7bc794492fffd0
 SHA512 (php-8.4.13.tar.xz) = 1801d4b55969dcfaea77671c91c3e99f1237dad1135123da335d585a43bb5afb8c0148381d89e399399c0887a0c17b1ae028c69c1ab999dfec117d7a197c1ea1
@@ -6,6 +6,7 @@ Size (php-8.4.13.tar.xz) = 13646008 byte
 SHA1 (patch-build_Makefile.global) = da9577733497d026315b4702cb19d673053148ed
 SHA1 (patch-build_php.m4) = bb72e38ab391ad587962940ba85e8d4de8633dca
 SHA1 (patch-configure.ac) = 2bdd1d2b1def552032dba5fbeb6140922b72c880
+SHA1 (patch-ext_iconv_iconv.c) = 4700eec0f48f3510b59e4da21857c232f6d9fc5e
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483

Added files:

Index: pkgsrc/lang/php84/patches/patch-ext_iconv_iconv.c
diff -u /dev/null pkgsrc/lang/php84/patches/patch-ext_iconv_iconv.c:1.1
--- /dev/null   Tue Oct  7 14:42:20 2025
+++ pkgsrc/lang/php84/patches/patch-ext_iconv_iconv.c   Tue Oct  7 14:42:20 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_iconv_iconv.c,v 1.1 2025/10/07 14:42:20 wiz Exp $
+
+Adapt for iconv(3) change in NetBSD 10.
+https://github.com/php/php-src/issues/20089
+
+--- ext/iconv/iconv.c.orig     2025-09-23 14:14:32.000000000 +0000
++++ ext/iconv/iconv.c
+@@ -44,6 +44,10 @@
+ #endif
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 1000000000)
+ // unfortunately, netbsd has still the old non posix conformant signature
+ // libiconv tends to match the eventual system's iconv too.
+ #define ICONV_CONST const