CVS commit: pkgsrc/www/arcticfox

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  6 21:22:42 UTC 2025

Modified Files:
        pkgsrc/www/arcticfox: Makefile distinfo
        pkgsrc/www/arcticfox/patches: patch-ipc_chromium_src_base_atomicops.h
            patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h

Log Message:
arcticfox: Fixes for NetBSD/mips.

Right now the jit doesn't support N32 but should work with O32 and N64.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/www/arcticfox/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/arcticfox/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h \
    pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.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.70 pkgsrc/www/arcticfox/Makefile:1.71
--- pkgsrc/www/arcticfox/Makefile:1.70  Thu May  1 06:44:25 2025
+++ pkgsrc/www/arcticfox/Makefile       Tue May  6 21:22:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2025/05/01 06:44:25 nia Exp $
+# $NetBSD: Makefile,v 1.71 2025/05/06 21:22:41 nia Exp $
 
 DISTNAME=      arcticfox-45.3
 # remove on next update
@@ -110,6 +110,9 @@ PLIST_VARS+=                ffvpx
 PLIST.ffvpx=           yes     # platform/old-configure.in
 .endif
 
+# Tries to include <sgidefs.h> which doesn't exist.
+CFLAGS.NetBSD+=        -DLIBYUV_DISABLE_MIPS=1
+
 CWRAPPERS_APPEND.cc+=  ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGNAME_NOREV}
 CWRAPPERS_APPEND.cxx+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGNAME_NOREV}
 CWRAPPERS_APPEND.ld+=  ${LINKER_RPATH_FLAG}${PREFIX}/lib/${PKGNAME_NOREV}

Index: pkgsrc/www/arcticfox/distinfo
diff -u pkgsrc/www/arcticfox/distinfo:1.22 pkgsrc/www/arcticfox/distinfo:1.23
--- pkgsrc/www/arcticfox/distinfo:1.22  Fri May  2 09:04:02 2025
+++ pkgsrc/www/arcticfox/distinfo       Tue May  6 21:22:41 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2025/05/02 09:04:02 nia Exp $
+$NetBSD: distinfo,v 1.23 2025/05/06 21:22:41 nia Exp $
 
 BLAKE2s (arcticfox-45.3/arcticfox-45.3.tar.gz) = 2f9940773f2898a264aebf3e36c729a5d6e3e63923f6fcffd64cc02749cfd02d
 SHA512 (arcticfox-45.3/arcticfox-45.3.tar.gz) = c49304c3e6c97cc92c875c9aad6afcc59d2f4072d9431c44c12a23df299c536c7d914ed14b8f395d75241c54d041e4b5cbe9c82c1d64910b5ad693eab3842829
@@ -7,7 +7,7 @@ BLAKE2s (arcticfox-45.3/icudt58b.dat.gz)
 SHA512 (arcticfox-45.3/icudt58b.dat.gz) = dbfd14dfe5b9b80c28ddd77c4a7e54ee7d844f75eff8fb0c891c20b45a7d1409ac59c9e4aa83cda6b5d59cf0477388c72633999ce4e68c16586100221c12fca8
 Size (arcticfox-45.3/icudt58b.dat.gz) = 10711741 bytes
 SHA1 (patch-intl_icu_source_configure) = 051da587e03131b3a6c1dec7c55ab0cc9c06c26c
-SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 3ca1d435c9f85d1e5a54532739909454c86242a2
+SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 2043fdb88aea0fa294d8a125c169ce8459b79456
 SHA1 (patch-ipc_chromium_src_base_atomicops__internals__arm__gcc.h) = ecf6c5ee16346c0ecf06c886fd7d76dc33b85734
 SHA1 (patch-js_src_jit_ExecutableAllocatorPosix.cpp) = 91e900b6d995edc70b3234468580f7db5aa88446
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 7af433cde0b6391facdf7f785f8f1b660f458a73
@@ -18,5 +18,5 @@ 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-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = eef34a9539f5ef2666bb26b175e3787ce4e50677
+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

Index: pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h
diff -u pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h:1.1 pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h:1.2
--- pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h:1.1    Sun Jul 28 18:50:33 2024
+++ pkgsrc/www/arcticfox/patches/patch-ipc_chromium_src_base_atomicops.h        Tue May  6 21:22:41 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-ipc_chromium_src_base_atomicops.h,v 1.1 2024/07/28 18:50:33 nia Exp $
+$NetBSD: patch-ipc_chromium_src_base_atomicops.h,v 1.2 2025/05/06 21:22:41 nia Exp $
 
 Fixes for NetBSD/arm, taken from www/firefox52
 
---- ipc/chromium/src/base/atomicops.h.orig     2024-03-20 16:39:08.000000000 +0000
+--- ipc/chromium/src/base/atomicops.h.orig     2025-03-13 13:33:35.000000000 +0000
 +++ ipc/chromium/src/base/atomicops.h
-@@ -45,7 +45,7 @@ typedef int64_t Atomic64;
+@@ -47,7 +47,7 @@ typedef int64_t Atomic64;
  
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
 -#ifdef OS_OPENBSD
-+#if defined(OS_OPENBSD) || (defined(OS_NETBSD) && defined(ARCH_CPU_ARM_FAMILY))
++#if defined(OS_OPENBSD) || (defined(OS_NETBSD) && (defined(ARCH_CPU_ARM_FAMILY) || defined(ARCH_CPU_MIPS)))
  #ifdef ARCH_CPU_64_BITS
  typedef Atomic64 AtomicWord;
  #else
Index: pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
diff -u pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.1 
pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.2
--- pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.1    Sun Jul 28 18:50:33 2024
+++ pkgsrc/www/arcticfox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h        Tue May  6 21:22:41 2025
@@ -1,17 +1,17 @@
-$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.1 2024/07/28 18:50:33 nia Exp $
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.2 2025/05/06 21:22:41 nia Exp $
 
 Fixes for NetBSD/arm, taken from www/firefox52
 
---- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2024-03-20 16:39:08.000000000 +0000
+--- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2025-03-13 13:33:35.000000000 +0000
 +++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h
 @@ -76,6 +76,11 @@ typedef intptr_t Atomic64;
  #endif
  #endif
  
-+#if defined(__NetBSD__) && defined(__arm__)
++#if defined(__NetBSD__) && (defined(__arm__) || defined(__mips__))
 +// NetBSD/arm uses long for intptr_t, which fails -fpermissive checks. So
 +// explicitly use int32 here instead.
-+typedef int32 AtomicWord;
++typedef Atomic32 AtomicWord;
 +#else
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.