--- a/mozilla-pgo.patch Sun Jan 15 22:34:49 2023 +0100
+++ b/mozilla-pgo.patch Mon Feb 13 22:24:53 2023 +0100
@@ -1,6 +1,6 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 02ffee15578fd4dc2dd5ade32e7dab907d633b0d
+# Parent 855b1f176633af8ae11c0d791c8b33e9a2ae88e0
diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
--- a/build/moz.configure/lto-pgo.configure
@@ -48,20 +48,20 @@
+++ b/build/pgo/profileserver.py
@@ -6,17 +6,17 @@
+ import glob
import json
import os
+ import subprocess
import sys
- import glob
- import subprocess
import mozcrash
--from mozbuild.base import MozbuildObject, BinaryNotFoundException
-+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
+-from mozbuild.base import BinaryNotFoundException, MozbuildObject
++from mozbuild.base import BinaryNotFoundException, MozbuildObject, BuildEnvironmentNotFoundException
from mozfile import TemporaryDirectory
from mozhttpd import MozHttpd
from mozprofile import FirefoxProfile, Preferences
from mozprofile.permissions import ServerLocations
- from mozrunner import FirefoxRunner, CLI
+ from mozrunner import CLI, FirefoxRunner
from six import string_types
PORT = 8888
@@ -101,7 +101,7 @@
base_profiles = json.load(fh)["profileserver"]
prefpaths = [
-@@ -207,16 +220,20 @@ if __name__ == "__main__":
+@@ -208,16 +221,20 @@ if __name__ == "__main__":
# Try to move the crash reports to the artifacts even if Firefox appears
# to exit successfully, in case there's a crash that doesn't set the
@@ -166,7 +166,7 @@
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
-@@ -461,16 +461,21 @@ void nsTerminator::StartWatchdog() {
+@@ -455,16 +455,21 @@ void nsTerminator::StartWatchdog() {
// Defend against overflow
crashAfterMS = INT32_MAX;
} else {