From d25a99cd21af508ccde4ef49341beae1a8191af5 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 5 Mar 2026 13:35:05 +0100 Subject: [PATCH] fix: remove duplicate patches, p=#12640 --- .../app/macbuild/Contents/Info-plist-in.patch | 13 --------- .../asyncshutdown/AsyncShutdown-sys-mjs.patch | 28 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 src/browser/app/macbuild/Contents/Info-plist-in.patch delete mode 100644 src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch diff --git a/src/browser/app/macbuild/Contents/Info-plist-in.patch b/src/browser/app/macbuild/Contents/Info-plist-in.patch deleted file mode 100644 index 3fa8021f7..000000000 --- a/src/browser/app/macbuild/Contents/Info-plist-in.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in -index 0c4fb837a24490c66b284abf2bd9299c2e021de0..ea28831b90662b12bdcb137c35b6bb83626c77e7 100644 ---- a/browser/app/macbuild/Contents/Info.plist.in -+++ b/browser/app/macbuild/Contents/Info.plist.in -@@ -190,8 +190,6 @@ - @MAC_APP_NAME@ @APP_VERSION@ - CFBundleIconFile - firefox.icns -- CFBundleIconName -- AppIcon - CFBundleIdentifier - @MOZ_MACBUNDLE_ID@ - CFBundleInfoDictionaryVersion diff --git a/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch b/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch deleted file mode 100644 index 336057c89..000000000 --- a/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs -index 2aaef80411b2cef9563c49f23d36b08222b06b03..7bd15ebb0d9d09da57a287b47beb1f0e2e17d229 100644 ---- a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs -+++ b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs -@@ -492,6 +492,23 @@ function getPhase(topic) { - } - return undefined; - }, -+ -+ /** -+ * Reset the phase after a call to _trigger(). -+ * For testing purposes only. -+ */ -+ get _reset() { -+ let accepted = Services.prefs.getBoolPref( -+ "toolkit.asyncshutdown.testing", -+ false -+ ); -+ if (accepted) { -+ return () => { -+ spinner = new Spinner(topic); -+ }; -+ } -+ return undefined; -+ }, - }); - gPhases.set(topic, phase); - return phase;