From aa83f85ba91dce7550a48210145ee23f6da5cd25 Mon Sep 17 00:00:00 2001 From: "Mr. M" Date: Wed, 5 Nov 2025 23:41:48 +0100 Subject: [PATCH] chore: Update to Firefox `145.0`, b=no-bug, c=l10n --- README.md | 2 +- build/firefox-cache/l10n-last-commit-hash | 2 +- .../base/content/browser-addons-js.patch | 33 +++++++++---------- .../ToolbarContextMenu-sys-mjs.patch | 16 ++++----- .../customizableui/content/panelUI-js.patch | 16 ++------- .../components/preferences/jar-mn.patch | 11 ++++--- .../preferences/main-inc-xhtml.patch | 12 ------- .../components/preferences/main-js.patch | 16 +++++++-- .../preferences/preferences-js.patch | 8 ++--- .../components/preferences/zen-settings.js | 5 +++ surfer.json | 4 +-- 11 files changed, 59 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index aa71c3917..670da32b8 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne ### Firefox Versions - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `144.0.2`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0.2`! +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0`! ### Contributing diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash index 26d328f6d..f451058a7 100644 --- a/build/firefox-cache/l10n-last-commit-hash +++ b/build/firefox-cache/l10n-last-commit-hash @@ -1 +1 @@ -860c37a26622f61c74c7cbb93f7e0ae759fcbfe1 \ No newline at end of file +7bc0bd3b3f84dddd16bc84ddb01bc55782177f5e \ No newline at end of file diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch index edd6cb122..acb98ccc7 100644 --- a/src/browser/base/content/browser-addons-js.patch +++ b/src/browser/base/content/browser-addons-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js -index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc31266b08 100644 +index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2bd5a757d 100644 --- a/browser/base/content/browser-addons.js +++ b/browser/base/content/browser-addons.js -@@ -1071,7 +1071,7 @@ var gXPInstallObserver = { +@@ -1069,7 +1069,7 @@ var gXPInstallObserver = { persistent: true, hideClose: true, popupOptions: { @@ -11,7 +11,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc }, }; -@@ -1280,7 +1280,7 @@ var gXPInstallObserver = { +@@ -1279,7 +1279,7 @@ var gXPInstallObserver = { hideClose: true, timeout: Date.now() + 30000, popupOptions: { @@ -20,7 +20,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc }, }; -@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = { +@@ -2211,7 +2211,7 @@ var gUnifiedExtensions = { // If the new ID is not added in NOTIFICATION_IDS, consider handling the case // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file. getPopupAnchorID(aBrowser, aWindow) { @@ -29,7 +29,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc const attr = anchorID + "popupnotificationanchor"; if (!aBrowser[attr]) { -@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = { +@@ -2222,7 +2222,7 @@ var gUnifiedExtensions = { anchorID // Anchor on the toolbar icon to position the popup right below the // button. @@ -38,7 +38,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc } return anchorID; -@@ -2516,11 +2516,7 @@ var gUnifiedExtensions = { +@@ -2646,11 +2646,7 @@ var gUnifiedExtensions = { // Lazy load the unified-extensions-panel panel the first time we need to // display it. if (!this._panel) { @@ -51,16 +51,15 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc let customizationArea = this._panel.querySelector( "#unified-extensions-area" ); -@@ -2570,7 +2566,7 @@ var gUnifiedExtensions = { - - // The button should directly open `about:addons` when the user does not - // have any active extensions listed in the unified extensions panel. -- if (!this.hasExtensionsInPanel()) { -+ if (!this.hasExtensionsInPanel() && false) { - let viewID; - if ( - Services.prefs.getBoolPref("extensions.getAddons.showPane", true) && -@@ -2615,7 +2611,7 @@ var gUnifiedExtensions = { +@@ -2703,6 +2699,7 @@ var gUnifiedExtensions = { + // and no alternative content is available for display in the panel. + const policies = this.getActivePolicies(); + if ( ++ false && + policies.length && + !this.hasExtensionsInPanel(policies) && + !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() && +@@ -2743,7 +2740,7 @@ var gUnifiedExtensions = { this.recordButtonTelemetry(reason || "extensions_panel_showing"); this.ensureButtonShownBeforeAttachingPanel(panel); PanelMultiView.openPopup(panel, this._button, { @@ -69,7 +68,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc triggerEvent: aEvent, }); } -@@ -2802,18 +2798,20 @@ var gUnifiedExtensions = { +@@ -2930,18 +2927,20 @@ var gUnifiedExtensions = { this._maybeMoveWidgetNodeBack(widgetId); } diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch index 7cee05643..628fc23d9 100644 --- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch +++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch @@ -1,15 +1,13 @@ diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -index 852cf2eee9113753fa0797be6dec80dcb9207703..93bb093e679320033a37b2af14e8e0e3c7621f94 100644 +index 95621ae202378fb1ebceca5623a98b790b9eb5ff..fe6901f53f863bca20a514df0490499402d669ae 100644 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -@@ -242,8 +242,8 @@ export var ToolbarContextMenu = { - // Show/hide sidebar and vertical tabs menu items - let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp"); +@@ -244,7 +244,7 @@ export var ToolbarContextMenu = { let showSidebarActions = -- ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) || -- toolbarItem?.localName == "toolbarspring"; -+ (["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) || -+ toolbarItem?.localName == "toolbarspring") && false; + ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) || + toolbarItem?.localName == "toolbarspring" || +- isTitlebarSpacer; ++ isTitlebarSpacer && false; + let toggleVerticalTabsItem = document.getElementById( "toolbar-context-toggle-vertical-tabs" - ); diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch index 23ea8bef7..86f016da1 100644 --- a/src/browser/components/customizableui/content/panelUI-js.patch +++ b/src/browser/components/customizableui/content/panelUI-js.patch @@ -1,18 +1,8 @@ diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js -index 7156397d597579f745ea20ae2b9327433a31c8ec..23c15c60acd77150ea89bd6f2fa1685a0cfc37fd 100644 +index d6393080aa8aff6c0f7b2043fd408b6f6249d0c4..bf37b46c4743b7619393c730720204380635666a 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js -@@ -518,8 +518,7 @@ const PanelUI = { - tempPanel.setAttribute("animate", "false"); - } - tempPanel.setAttribute("context", ""); -- document -- .getElementById(CustomizableUI.AREA_NAVBAR) -+ aAnchor.closest("toolbar") - .appendChild(tempPanel); - - let multiView = document.createXULElement("panelmultiview"); -@@ -610,10 +609,12 @@ const PanelUI = { +@@ -608,10 +608,12 @@ const PanelUI = { if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) { this.navbar.setAttribute("nonemptyoverflow", "true"); this.overflowPanel.setAttribute("hasfixeditems", "true"); @@ -25,7 +15,7 @@ index 7156397d597579f745ea20ae2b9327433a31c8ec..23c15c60acd77150ea89bd6f2fa1685a } }, -@@ -961,7 +962,7 @@ const PanelUI = { +@@ -959,7 +961,7 @@ const PanelUI = { el.removeAttribute("data-lazy-l10n-id"); }); diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch index 1f1b5e52a..59429d78a 100644 --- a/src/browser/components/preferences/jar-mn.patch +++ b/src/browser/components/preferences/jar-mn.patch @@ -1,10 +1,11 @@ diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index a786155d80a9f1f09d209f2da11437ee2d662739..2e422b48b452698275118d336d1b16af6a221577 100644 +index 65efb0666785cc79e58015e19ec55216bf4ec9c4..95941c52ffd4c9ee36f584413fb96d59721113db 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn -@@ -30,3 +30,5 @@ browser.jar: - content/browser/preferences/widgets/setting-control.mjs (widgets/setting-control/setting-control.mjs) - content/browser/preferences/widgets/setting-group.mjs (widgets/setting-group/setting-group.mjs) - content/browser/preferences/widgets/setting-group.css (widgets/setting-group/setting-group.css) +@@ -33,3 +33,5 @@ browser.jar: + content/browser/preferences/widgets/setting-pane.mjs (widgets/setting-pane/setting-pane.mjs) + content/browser/preferences/widgets/security-privacy-card.mjs (widgets/security-privacy/security-privacy-card/security-privacy-card.mjs) + content/browser/preferences/widgets/security-privacy-card.css (widgets/security-privacy/security-privacy-card/security-privacy-card.css) + + content/browser/preferences/zen-settings.js +\ No newline at end of file diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch index de244411a..5568e6b8a 100644 --- a/src/browser/components/preferences/main-inc-xhtml.patch +++ b/src/browser/components/preferences/main-inc-xhtml.patch @@ -2,18 +2,6 @@ diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/ index 891cf7108cf4606c99a902afa420e744b9690b87..2bdbc1f0b6ac2c883dcbd706aed0615fad5e0760 100644 --- a/browser/components/preferences/main.inc.xhtml +++ b/browser/components/preferences/main.inc.xhtml -@@ -29,6 +29,11 @@ - - -+ -+ -+ - #ifdef XP_WIN -