CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 22 13:48:17 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-toolkit_moz.configure

Log Message:
firefox: build with --enable-forkserver. Bump.

This makes parent of content processes be the forkserver process rather than
the chrome process. It removes some complexity around setting up and tearing
down content processes from the main process and decreases memory usage.

This is the default on Linux and other BSDs and makes us less likely to trip
over bugs in code paths upstream don't test often.


To generate a diff of this commit:
cvs rdiff -u -r1.567 -r1.568 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.506 -r1.507 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.261 -r1.262 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.16 -r1.17 \
    pkgsrc/www/firefox/patches/patch-toolkit_moz.configure

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

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.567 pkgsrc/www/firefox/Makefile:1.568
--- pkgsrc/www/firefox/Makefile:1.567   Thu Aug 17 20:43:43 2023
+++ pkgsrc/www/firefox/Makefile Tue Aug 22 13:48:16 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.567 2023/08/17 20:43:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.568 2023/08/22 13:48:16 tnn Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            116.0
 MOZ_BRANCH_MINOR=      .3
+PKGREVISION=           1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.506 pkgsrc/www/firefox/distinfo:1.507
--- pkgsrc/www/firefox/distinfo:1.506   Sun Aug 20 21:41:54 2023
+++ pkgsrc/www/firefox/distinfo Tue Aug 22 13:48:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.506 2023/08/20 21:41:54 tnn Exp $
+$NetBSD: distinfo,v 1.507 2023/08/22 13:48:16 tnn Exp $
 
 BLAKE2s (firefox-116.0.3.source.tar.xz) = 22e0a147eaeab2c65516f3bd7277ba7ff45e232d7f2ba56179f6f5a6c88bd6c0
 SHA512 (firefox-116.0.3.source.tar.xz) = 194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9
@@ -38,7 +38,7 @@ SHA1 (patch-third__party_sqlite3_src_moz
 SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc
-SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb
+SHA1 (patch-toolkit_moz.configure) = 1306e7ac3c3939886aff38a58dd3162e6517409b
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
 SHA1 (patch-toolkit_xre_glxtest.cpp) = adcd5b05fcbd7b41c01a2aa66f3e8f05ed230444
 SHA1 (patch-widget_gtk_v4l2test_v4l2test.cpp) = a9ed8692a703d3b31bdbc8d0582a60540922a1dd

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.261 pkgsrc/www/firefox/mozilla-common.mk:1.262
--- pkgsrc/www/firefox/mozilla-common.mk:1.261  Thu Aug 17 20:43:43 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Tue Aug 22 13:48:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.261 2023/08/17 20:43:43 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.262 2023/08/22 13:48:17 tnn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -102,6 +102,7 @@ CONFIGURE_ARGS+=    --with-system-libevent
 CONFIGURE_ARGS+=       --disable-crashreporter
 CONFIGURE_ARGS+=       --enable-chrome-format=omni
 CONFIGURE_ARGS+=       --with-system-webp
+CONFIGURE_ARGS+=       --enable-forkserver
 
 #CONFIGURE_ARGS+=      --enable-readline
 CONFIGURE_ARGS+=       --disable-icf

Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.16 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.17
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.16 Wed Apr  5 14:22:36 2023
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure      Tue Aug 22 13:48:17 2023
@@ -1,10 +1,11 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.16 2023/04/05 14:22:36 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.17 2023/08/22 13:48:17 tnn Exp $
 
 * Enable ALSA for NetBSD too.
+* Support --enable-forkserver on NetBSD.
 
---- toolkit/moz.configure.orig 2023-03-02 21:15:57.000000000 +0000
+--- toolkit/moz.configure.orig 2023-08-15 21:10:03.000000000 +0000
 +++ toolkit/moz.configure
-@@ -243,6 +243,7 @@ def imply_alsa(values, target):
+@@ -242,6 +242,7 @@ def imply_alsa(values, target):
          any("alsa" in value for value in values)
          and target.kernel != "Linux"
          and target.os != "FreeBSD"
@@ -12,3 +13,19 @@ $NetBSD: patch-toolkit_moz.configure,v 1
      ):
          die("Cannot enable ALSA on %s", target.os)
      return any("alsa" in value for value in values) or None
+@@ -2816,6 +2817,7 @@ def forkserver_default(target, build_pro
+         (target.os == "GNU" and target.kernel == "Linux")
+         or target.os == "FreeBSD"
+         or target.os == "OpenBSD"
++        or target.os == "NetBSD"
+     )
+ 
+ 
+@@ -2834,6 +2836,7 @@ def forkserver_flag(value, target):
+         or (target.os == "GNU" and target.kernel == "Linux")
+         or target.os == "FreeBSD"
+         or target.os == "OpenBSD"
++        or target.os == "NetBSD"
+     ):
+         return bool(value)
+     pass