CVS commit: pkgsrc/www/firefox115

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Aug  1 15:21:26 UTC 2024

Modified Files:
        pkgsrc/www/firefox115: Makefile distinfo
        pkgsrc/www/firefox115/patches: patch-config_makefiles_rust.mk
Added Files:
        pkgsrc/www/firefox115/patches: patch-js_public_Utility.h

Log Message:
www/firefox115: Fix build under NetBSD/i386 10.0 at least

* Remove static_assert()s. This is not valid for NetBSD/i386 10 or later.
  This may be inconsistency between stddef.h and GCC's assumption.
* Force Clto=thin to reduce memory usage during build.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/firefox115/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/firefox115/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk
cvs rdiff -u -r0 -r1.2 \
    pkgsrc/www/firefox115/patches/patch-js_public_Utility.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/firefox115/Makefile
diff -u pkgsrc/www/firefox115/Makefile:1.25 pkgsrc/www/firefox115/Makefile:1.26
--- pkgsrc/www/firefox115/Makefile:1.25 Tue Jul  9 22:18:47 2024
+++ pkgsrc/www/firefox115/Makefile      Thu Aug  1 15:21:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/07/09 22:18:47 gutteridge Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/01 15:21:25 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            115.13

Index: pkgsrc/www/firefox115/distinfo
diff -u pkgsrc/www/firefox115/distinfo:1.11 pkgsrc/www/firefox115/distinfo:1.12
--- pkgsrc/www/firefox115/distinfo:1.11 Tue Jul  9 22:18:47 2024
+++ pkgsrc/www/firefox115/distinfo      Thu Aug  1 15:21:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2024/07/09 22:18:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2024/08/01 15:21:25 ryoon Exp $
 
 BLAKE2s (firefox-115.13.0esr.source.tar.xz) = f0cc616f13869bdfe9e2b740373bf16f84fd6deaffd2029068ecafc115a9db05
 SHA512 (firefox-115.13.0esr.source.tar.xz) = 799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f
@@ -10,7 +10,7 @@ SHA1 (patch-browser_app_profile_firefox.
 SHA1 (patch-build_moz.configure_init.configure) = 65deb3c233df0aab81eb1fca05d708e5a4ed169a
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
-SHA1 (patch-config_makefiles_rust.mk) = 788ab8fed45625bc5552c56a3ab05b5ed7d49a8f
+SHA1 (patch-config_makefiles_rust.mk) = 7c3649060aec923a18196e9b1accb590660be710
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp) = b93b4c6367bd2fb3d1868ab7d97ca56c100be414
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
@@ -22,6 +22,7 @@ SHA1 (patch-intl_lwbrk_LineBreaker.cpp) 
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b
+SHA1 (patch-js_public_Utility.h) = e3916ecc334196950543350dcd28f3b31cc239d0
 SHA1 (patch-js_src_jit_FlushICache.cpp) = b7536050d06e87612fbedc7ce269b5f120eb0ce9
 SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 1e25924a29e3700b0e0e5d143f1db35029b431fb
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba

Index: pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk
diff -u pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk:1.1 pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk:1.2
--- pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk:1.1    Mon Sep 11 12:33:25 2023
+++ pkgsrc/www/firefox115/patches/patch-config_makefiles_rust.mk        Thu Aug  1 15:21:26 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2023/09/11 12:33:25 ryoon Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.2 2024/08/01 15:21:26 ryoon Exp $
 
 NetBSD doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.
@@ -23,7 +23,7 @@ From: https://bugzilla.mozilla.org/show_
  ifndef MOZ_CODE_COVERAGE
  ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
 -cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
-+cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=thin)
++cargo_rustc_flags += -Clto=thin
  endif
  # We need -Cembed-bitcode=yes for all crates when using -Clto.
  RUSTFLAGS += -Cembed-bitcode=yes

Added files:

Index: pkgsrc/www/firefox115/patches/patch-js_public_Utility.h
diff -u /dev/null pkgsrc/www/firefox115/patches/patch-js_public_Utility.h:1.2
--- /dev/null   Thu Aug  1 15:21:26 2024
+++ pkgsrc/www/firefox115/patches/patch-js_public_Utility.h     Thu Aug  1 15:21:26 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-js_public_Utility.h,v 1.2 2024/08/01 15:21:26 ryoon Exp $
+
+--- js/public/Utility.h.orig   2024-07-23 09:35:47.511722387 +0000
++++ js/public/Utility.h
+@@ -478,9 +478,6 @@ static inline void js_free(void* p) {
+ #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS)              \
+   template <class T, typename... Args>                                      \
+   QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) {                \
+-    static_assert(                                                          \
+-        alignof(T) <= alignof(max_align_t),                                 \
+-        "over-aligned type is not supported by JS_DECLARE_NEW_METHODS");    \
+     void* memory = ALLOCATOR(sizeof(T));                                    \
+     return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...) \
+                               : nullptr;                                    \
+@@ -497,9 +494,6 @@ static inline void js_free(void* p) {
+ #define JS_DECLARE_NEW_ARENA_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS)           \
+   template <class T, typename... Args>                                         \
+   QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(arena_id_t arena, Args&&... args) { \
+-    static_assert(                                                             \
+-        alignof(T) <= alignof(max_align_t),                                    \
+-        "over-aligned type is not supported by JS_DECLARE_NEW_ARENA_METHODS"); \
+     void* memory = ALLOCATOR(arena, sizeof(T));                                \
+     return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...)    \
+                               : nullptr;                                       \