[pkgsrc/trunk]: pkgsrc/www/firefox firefox: backport upstream patch to fix a ...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71b3d1b12cfa
branches:  trunk
changeset: 441126:71b3d1b12cfa
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Oct 26 21:20:59 2020 +0000

description:
firefox: backport upstream patch to fix a build race. This appears as
libmozgtk.so missing as well as the symbols it contains.

This affects pkgsrc-stable as well.

diffstat:

 www/firefox/distinfo                      |   3 ++-
 www/firefox/patches/patch-race_recurse.mk |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (51 lines):

diff -r 0838424fc95d -r 71b3d1b12cfa www/firefox/distinfo
--- a/www/firefox/distinfo      Mon Oct 26 17:19:29 2020 +0000
+++ b/www/firefox/distinfo      Mon Oct 26 21:20:59 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.415 2020/10/23 12:37:14 tnn Exp $
+$NetBSD: distinfo,v 1.416 2020/10/26 21:20:59 maya Exp $
 
 SHA1 (firefox-82.0.source.tar.xz) = aa8485a65038f1390eb9c367f5b6195cb7ca3bb8
 RMD160 (firefox-82.0.source.tar.xz) = f2afbc309b0a304c6082731f9a652a750d307ac7
@@ -29,6 +29,7 @@
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2d2ff8b4f9fe883b345d0ffc0d8e81aacf37a292
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
+SHA1 (patch-race_recurse.mk) = 6a732be998d7718969f38873092f902650e4b748
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = fb285a1d716a251aa133ab50609f72cbd1032536
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
diff -r 0838424fc95d -r 71b3d1b12cfa www/firefox/patches/patch-race_recurse.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-race_recurse.mk Mon Oct 26 21:20:59 2020 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-race_recurse.mk,v 1.1 2020/10/26 21:20:59 maya Exp $
+
+Apply patch from Firefox 83 to fix a rare build race.
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla%glandium.org@localhost>
+# Date 1602073076 0
+# Node ID 4489f33bf6521cdc4ecc915063d8733f5daa0814
+# Parent  569eb3fda698916ef2dc1c844a76ccd8642e0ef6
+Bug 1669442 - Fix dependency between libxul and mozgtk after bug 1573566. r=andi,dmajor
+
+Bug 1573566 moved libxul from toolkit/library to toolkit/library/build,
+and that should be reflected in config/recurse.mk.
+
+It's amazing the race condition hasn't caused problems earlier than now.
+
+Differential Revision: https://phabricator.services.mozilla.com/D92708
+
+
+--- config/recurse.mk.orig     2020-10-14 17:20:16.000000000 +0000
++++ config/recurse.mk
+@@ -206,7 +206,7 @@ endif
+ # Interdependencies that moz.build world don't know about yet for compilation.
+ # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+-toolkit/library/target: widget/gtk/mozgtk/gtk3/target
++toolkit/library/build/target: widget/gtk/mozgtk/gtk3/target
+ endif
+ 
+ ifndef MOZ_FOLD_LIBS