aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-03-26 00:29:51 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-03-26 00:29:51 +0000
commit2eef7fe6f8ccd3f7616fe1d55d758ee9a6c41fbb (patch)
treed9d0b6eccb4d6ddf88b7195a1bbefcad4b34792f
parent961c1dbb54b0f663fad402b28f50aa9fdfc299bc (diff)
downloadports-2eef7fe6f8ccd3f7616fe1d55d758ee9a6c41fbb.tar.gz
ports-2eef7fe6f8ccd3f7616fe1d55d758ee9a6c41fbb.zip
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
Notes
Notes: svn path=/branches/2020Q1/; revision=529159
-rw-r--r--www/firefox/Makefile2
-rw-r--r--www/firefox/files/patch-bug162255128
2 files changed, 29 insertions, 1 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c2f6fe260f95..2beea0f9d98e 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= firefox
DISTVERSION= 74.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/firefox/files/patch-bug1622551 b/www/firefox/files/patch-bug1622551
new file mode 100644
index 000000000000..4b179cf8a31b
--- /dev/null
+++ b/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) {