From owner-svn-ports-all@freebsd.org Thu Mar 26 00:29:59 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D750269042; Thu, 26 Mar 2020 00:29:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nm8k33JCz4ckj; Thu, 26 Mar 2020 00:29:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDF392466C; Thu, 26 Mar 2020 00:29:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02Q0TpTf095936; Thu, 26 Mar 2020 00:29:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02Q0Tpqi095934; Thu, 26 Mar 2020 00:29:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003260029.02Q0Tpqi095934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 26 Mar 2020 00:29:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r529159 - in branches/2020Q1/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/www/firefox: . files X-SVN-Commit-Revision: 529159 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 00:29:59 -0000 Author: jbeich Date: Thu Mar 26 00:29:51 2020 New Revision: 529159 URL: https://svnweb.freebsd.org/changeset/ports/529159 Log: MFH: r529155 www/firefox: backport fix for a warning after r527804 JavaScript error: resource:///modules/BrowserGlue.jsm, line 2210: TypeError: Services.profiler is undefined Approved by: ports-secteam blanket Added: branches/2020Q1/www/firefox/files/patch-bug1622551 - copied unchanged from r529155, head/www/firefox/files/patch-bug1622551 Modified: branches/2020Q1/www/firefox/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/firefox/Makefile ============================================================================== --- branches/2020Q1/www/firefox/Makefile Thu Mar 26 00:29:29 2020 (r529158) +++ branches/2020Q1/www/firefox/Makefile Thu Mar 26 00:29:51 2020 (r529159) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 74.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied: branches/2020Q1/www/firefox/files/patch-bug1622551 (from r529155, head/www/firefox/files/patch-bug1622551) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/www/firefox/files/patch-bug1622551 Thu Mar 26 00:29:51 2020 (r529159, copy of r529155, head/www/firefox/files/patch-bug1622551) @@ -0,0 +1,28 @@ +Silence Service.profiler errors on Tier3 after bug 1613390 + +diff --git browser/components/BrowserGlue.jsm browser/components/BrowserGlue.jsm +index 8f86bf0584a99..2ce53c6921d15 100644 +--- browser/components/BrowserGlue.jsm ++++ browser/components/BrowserGlue.jsm +@@ -2300,7 +2300,9 @@ BrowserGlue.prototype = { + ChromeUtils.idleDispatch( + () => { + if (!Services.startup.shuttingDown) { +- Services.profiler.AddMarker("startupIdleTask"); ++ if (Services.profiler) { ++ Services.profiler.AddMarker("startupIdleTask"); ++ } + try { + task.task(); + } catch (ex) { +@@ -2371,7 +2373,9 @@ BrowserGlue.prototype = { + for (let task of idleTasks) { + ChromeUtils.idleDispatch(() => { + if (!Services.startup.shuttingDown) { +- Services.profiler.AddMarker("startupLateIdleTask"); ++ if (Services.profiler) { ++ Services.profiler.AddMarker("startupLateIdleTask"); ++ } + try { + task(); + } catch (ex) {