Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6C7221A9239 for ; Mon, 26 Oct 2020 21:21:01 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D546984D52; Mon, 26 Oct 2020 21:21:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 586C584D47 for ; Mon, 26 Oct 2020 21:21:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id MTeJ1UY6jzaf for ; Mon, 26 Oct 2020 21:20:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BC2B684CE0 for ; Mon, 26 Oct 2020 21:20:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AE79FFB28; Mon, 26 Oct 2020 21:20:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1603747259163090" MIME-Version: 1.0 Date: Mon, 26 Oct 2020 21:20:59 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20201026212059.AE79FFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1603747259163090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Mon Oct 26 21:20:59 UTC 2020 Modified Files: pkgsrc/www/firefox: distinfo Added Files: pkgsrc/www/firefox/patches: patch-race_recurse.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.415 -r1.416 pkgsrc/www/firefox/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/www/firefox/patches/patch-race_recurse.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1603747259163090 Content-Disposition: inline Content-Length: 2721 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/distinfo diff -u pkgsrc/www/firefox/distinfo:1.415 pkgsrc/www/firefox/distinfo:1.416 --- pkgsrc/www/firefox/distinfo:1.415 Fri Oct 23 12:37:14 2020 +++ pkgsrc/www/firefox/distinfo Mon Oct 26 21:20:59 2020 @@ -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_libpng_pngpriv.h) = c8 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 Added files: Index: pkgsrc/www/firefox/patches/patch-race_recurse.mk diff -u /dev/null pkgsrc/www/firefox/patches/patch-race_recurse.mk:1.1 --- /dev/null Mon Oct 26 21:20:59 2020 +++ pkgsrc/www/firefox/patches/patch-race_recurse.mk Mon Oct 26 21:20:59 2020 @@ -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 +# 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 --_----------=_1603747259163090--