CVS commit: pkgsrc/www/arcticfox

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Oct 12 09:40:03 UTC 2025

Modified Files:
        pkgsrc/www/arcticfox: Makefile distinfo
Added Files:
        pkgsrc/www/arcticfox/patches: patch-security_nss_lib_zlib_zconf.h

Log Message:
fix build for GCC 14.

mostly this is applying "-Wno-implicit-int -Wno-int-conversion" for
GCC 14+ but there's a small hack needed for the embedded zlib to
include unistd.h on netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/www/arcticfox/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/arcticfox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/arcticfox/patches/patch-security_nss_lib_zlib_zconf.h

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

Modified files:

Index: pkgsrc/www/arcticfox/Makefile
diff -u pkgsrc/www/arcticfox/Makefile:1.73 pkgsrc/www/arcticfox/Makefile:1.74
--- pkgsrc/www/arcticfox/Makefile:1.73  Sat Aug 30 22:46:29 2025
+++ pkgsrc/www/arcticfox/Makefile       Sun Oct 12 09:40:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2025/08/30 22:46:29 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2025/10/12 09:40:02 mrg Exp $
 
 DISTNAME=      arcticfox-46.1
 PKGREVISION=   1
@@ -155,6 +155,11 @@ post-install:
        ${INSTALL_DATA} ${WRKDIR}/icudt58b.dat \
            ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/icudt58b.dat
 
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc-14.*) || !empty(CC_VERSION:Mgcc-15.*)
+CFLAGS+= -Wno-implicit-int -Wno-int-conversion
+.endif
+
 .include "options.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .if ${OPSYS} == "Linux"

Index: pkgsrc/www/arcticfox/distinfo
diff -u pkgsrc/www/arcticfox/distinfo:1.24 pkgsrc/www/arcticfox/distinfo:1.25
--- pkgsrc/www/arcticfox/distinfo:1.24  Fri Aug  1 10:40:59 2025
+++ pkgsrc/www/arcticfox/distinfo       Sun Oct 12 09:40:02 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2025/08/01 10:40:59 nia Exp $
+$NetBSD: distinfo,v 1.25 2025/10/12 09:40:02 mrg Exp $
 
 BLAKE2s (arcticfox-46.1.tar.gz) = 5a8eb6ea3cd36a1ec11d327387dfe39beb133795f1a556c4759c57fc0fc44d89
 SHA512 (arcticfox-46.1.tar.gz) = 220d88fbef63f5a3567b88bd65192b51b41cd3a5f18f33fced078846d3e2862a343ccfc817dc172b8281ac4d77eeca2e3d539ddf8b73b28e3360aab83afa7859
@@ -18,5 +18,6 @@ SHA1 (patch-media_libyuv_source_scale__a
 SHA1 (patch-nsprpub_pr_include_md___netbsd.cfg) = cf3afcd707440055d945363839fa38b7ec72d561
 SHA1 (patch-nsprpub_pr_include_md___netbsd.h) = 0d9129445fae852d3a9d5015a5634f3a9eb232e7
 SHA1 (patch-old-configure.in) = 6cfeb1cc72cb23122bd83e91a64d0c9b5a410324
+SHA1 (patch-security_nss_lib_zlib_zconf.h) = 3646c5fbe699341ef80f43cb6c48afb1d9dfaf25
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 7afc1aa53dbef467cbbc33852a92c219f5340d5b
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 0ce774c5dc9f53a858d4b9f490ec25d548b4bb96

Added files:

Index: pkgsrc/www/arcticfox/patches/patch-security_nss_lib_zlib_zconf.h
diff -u /dev/null pkgsrc/www/arcticfox/patches/patch-security_nss_lib_zlib_zconf.h:1.1
--- /dev/null   Sun Oct 12 09:40:03 2025
+++ pkgsrc/www/arcticfox/patches/patch-security_nss_lib_zlib_zconf.h    Sun Oct 12 09:40:03 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-security_nss_lib_zlib_zconf.h,v 1.1 2025/10/12 09:40:03 mrg Exp $
+
+Terrible hack for GCC 14, and others.  Z_HAVE_UNISTD_H doesn't get set,
+so it doesn't try to include <unistd.h>.  Fail happens.
+
+
+--- security/nss/lib/zlib/zconf.h.orig 2025-07-16 15:47:04.000000000 -0700
++++ security/nss/lib/zlib/zconf.h      2025-10-11 23:59:26.109778584 -0700
+@@ -356,6 +356,11 @@ typedef uLong FAR uLongf;
+    typedef Byte       *voidp;
+ #endif
+ 
++/* XXXMRG: Doesn't get set. */
++#if defined(__NetBSD__) && !defined(Z_HAVE_UNISTD_H)
++#  define Z_HAVE_UNISTD_H
++#endif
++
+ #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+ #  define Z_HAVE_UNISTD_H
+ #endif