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 1/3] 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;
From 3f0f07ac3787f0971cc33a744cdbb6f4cab229aa Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 5 Mar 2026 14:41:55 +0100
Subject: [PATCH 2/3] fix: script interpreters and permissions, p=#12641
---
.github/workflows/src/release-build.sh | 2 +-
locales/update-supported-languages.sh | 1 +
scripts/download-language-packs.sh | 1 +
scripts/fetch-formal-git-components.sh | 2 +-
scripts/recalculate-patches.sh | 2 +-
scripts/remove-failed-jobs.sh | 2 +-
scripts/update-surfer.sh | 2 +-
src/browser/themes/shared/zen-icons/update-resources.sh | 1 +
8 files changed, 8 insertions(+), 5 deletions(-)
mode change 100644 => 100755 locales/update-supported-languages.sh
mode change 100644 => 100755 scripts/download-language-packs.sh
mode change 100644 => 100755 scripts/fetch-formal-git-components.sh
mode change 100644 => 100755 scripts/recalculate-patches.sh
mode change 100644 => 100755 scripts/remove-failed-jobs.sh
mode change 100644 => 100755 scripts/update-surfer.sh
diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh
index 853f55b3a..e553f3942 100644
--- a/.github/workflows/src/release-build.sh
+++ b/.github/workflows/src/release-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -xe
diff --git a/locales/update-supported-languages.sh b/locales/update-supported-languages.sh
old mode 100644
new mode 100755
index ae27a816c..43ba824b8
--- a/locales/update-supported-languages.sh
+++ b/locales/update-supported-languages.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
LANGS_FILE="./supported-languages"
# Clean up the file
diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
old mode 100644
new mode 100755
index aa4633ef7..5945ad0b8
--- a/scripts/download-language-packs.sh
+++ b/scripts/download-language-packs.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/scripts/fetch-formal-git-components.sh b/scripts/fetch-formal-git-components.sh
old mode 100644
new mode 100755
index 527483a3f..e40322ed2
--- a/scripts/fetch-formal-git-components.sh
+++ b/scripts/fetch-formal-git-components.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
old mode 100644
new mode 100755
index b03cf83ce..2bb2d5e3e
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/scripts/remove-failed-jobs.sh b/scripts/remove-failed-jobs.sh
old mode 100644
new mode 100755
index f3cd7da24..a3cfd554e
--- a/scripts/remove-failed-jobs.sh
+++ b/scripts/remove-failed-jobs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/scripts/update-surfer.sh b/scripts/update-surfer.sh
old mode 100644
new mode 100755
index 7d720ab2a..157ca62d2
--- a/scripts/update-surfer.sh
+++ b/scripts/update-surfer.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/src/browser/themes/shared/zen-icons/update-resources.sh b/src/browser/themes/shared/zen-icons/update-resources.sh
index 196e7f7f6..ee4bea86a 100755
--- a/src/browser/themes/shared/zen-icons/update-resources.sh
+++ b/src/browser/themes/shared/zen-icons/update-resources.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
From dbf6daebdc088091fcd19e73dc0d2896cf6590d1 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 5 Mar 2026 16:47:34 +0100
Subject: [PATCH 3/3] chore: add ignored files in recalculate-patches, p=#12642
---
scripts/recalculate-patches.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
index 2bb2d5e3e..f19684099 100755
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -12,6 +12,9 @@ IGNORE_FILES=(
"shared.nsh"
"ignorePrefs.json"
"moz.configure"
+ "AsyncShutdown.sys.mjs"
+ "Info.plist.in"
+ "firefox.js"
)
# Recursively find all .patch files in the current directory and its subdirectories