Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit fe3d24e

Browse files
authored
🔀 Update Firefox to 109.0 (#200)
Update to 109.0
2 parents 66b6381 + e063f2d commit fe3d24e

File tree

9 files changed

+92
-76
lines changed

9 files changed

+92
-76
lines changed

‎gluon.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"binaryName": "pulse-browser",
66
"version": {
77
"product": "firefox",
8-
"version": "108.0.1"
8+
"version": "109.0"
99
},
1010
"buildOptions": {
1111
"generateBranding": true
@@ -15,7 +15,7 @@
1515
"platform": "github",
1616
"id": "uBlock0@raymondhill.net",
1717
"repo": "gorhill/uBlock",
18-
"version": "1.45.2",
18+
"version": "1.46.0",
1919
"fileGlob": "uBlock0_*.firefox(.signed)?.xpi"
2020
},
2121
"tabliss": {
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/browser/components/migration/ChromeMigrationUtils.sys.mjs b/browser/components/migration/ChromeMigrationUtils.sys.mjs
2+
--- a/browser/components/migration/ChromeMigrationUtils.sys.mjs
3+
+++ b/browser/components/migration/ChromeMigrationUtils.sys.mjs
4+
@@ -297,12 +297,12 @@
5+
"Chrome Dev": ["google-chrome-unstable"],
6+
Chromium: ["chromium"],
7+
"Opera GX": ["Opera-GX"],
8+
// Canary is not available on Linux.
9+
// Edge is not available on Linux.
10+
- Opera: ["Opera"],
11+
- Vivaldi: ["Vivaldi"],
12+
+ Opera: ["opera"],
13+
+ Vivaldi: ["vivaldi"],
14+
},
15+
};
16+
let subfolders = SUB_DIRECTORIES[AppConstants.platform][chromeProjectName];
17+
if (!subfolders) {
18+
return null;
19+
Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c37b23031 100644
2+
index 9b56ba74cff12f029b6d8910ff487a216a15194f..603a2b90f800b8f702ab2c1c61ce922c11459ce6 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
55
@@ -19,6 +19,8 @@
@@ -19,7 +19,7 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
1919
pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
2020

2121
// Enable extensionStorage storage actor by default
22-
@@ -774,7 +775,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
22+
@@ -802,7 +803,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
2323
pref("browser.tabs.tooltipsShowPidAndActiveness", false);
2424
#endif
2525

@@ -28,16 +28,7 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
2828
pref("browser.tabs.firefox-view.logLevel", "Warn");
2929
pref("browser.tabs.firefox-view.notify-for-tabs", false);
3030

31-
@@ -1945,7 +1946,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
32-
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
33-
34-
// Default to enabling VPN promo messages to be shown when specified and allowed
35-
-pref("browser.vpn_promo.enabled", true);
36-
+pref("browser.vpn_promo.enabled", false);
37-
// Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
38-
// The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe
39-
// The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES
40-
@@ -2066,10 +2067,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000);
31+
@@ -2082,10 +2083,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000);
4132
pref("browser.tabs.crashReporting.sendReport", true);
4233
pref("browser.tabs.crashReporting.includeURL", false);
4334

@@ -48,8 +39,16 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
4839
#if defined(XP_LINUX) || defined(XP_WIN)
4940
// Allows us to adjust the priority of child processes at the OS level
5041
pref("dom.ipc.processPriorityManager.enabled", true);
51-
@@ -2117,10 +2114,10 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 180);
52-
pref("browser.migrate.showBookmarksToolbarAfterMigration", true);
42+
@@ -2149,17 +2146,15 @@ pref("browser.migrate.edge.enabled", true);
43+
pref("browser.migrate.firefox.enabled", true);
44+
pref("browser.migrate.ie.enabled", true);
45+
pref("browser.migrate.safari.enabled", true);
46+
-pref("browser.migrate.opera.enabled", false);
47+
-pref("browser.migrate.vivaldi.enabled", false);
48+
-pref("browser.migrate.opera-gx.enabled", false);
49+
+// Temporarily override browser.migrate for opera and vivaldi
50+
51+
pref("browser.migrate.content-modal.enabled", false);
5352

5453
pref("extensions.pocket.api", "api.getpocket.com");
5554
-pref("extensions.pocket.enabled", true);
@@ -61,30 +60,15 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
6160
pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
6261

6362
// Enable Pocket button home panel for non link pages.
64-
@@ -2251,9 +2248,10 @@ pref("toolkit.coverage.enabled", false);
63+
@@ -2290,8 +2285,9 @@ pref("toolkit.coverage.enabled", false);
6564
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
6665

6766
// Discovery prefs
6867
-pref("browser.discovery.enabled", true);
6968
-pref("browser.discovery.containers.enabled", true);
70-
-pref("browser.discovery.sites", "addons.mozilla.org");
71-
+//
72-
+// From memory, these connect to Google Analytics, so they are a no go
73-
+pref("browser.discovery.enabled", false);
74-
+pref("browser.discovery.containers.enabled", false);
75-
76-
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
77-
pref("browser.engagement.downloads-button.has-used", false);
78-
.mozilla.org");
79-
80-
// Discovery prefs
81-
-pref("browser.discovery.enabled", true);
82-
-pref("browser.discovery.containers.enabled", true);
83-
-pref("browser.discovery.sites", "addons.mozilla.org");
84-
+//
85-
+// From memory, these connect to Google Analytics, so they are a no go
69+
+// From memory, this uses google analytics
8670
+pref("browser.discovery.enabled", false);
8771
+pref("browser.discovery.containers.enabled", false);
72+
pref("browser.discovery.sites", "addons.mozilla.org");
8873

8974
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
90-
pref("browser.engagement.downloads-button.has-used", false);

‎src/browser/app/profile/pulse-browser.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
//
55
// Note: You must have semicolons at the end of each line in user setting files
66

7+
// Enable importers for other browsers
8+
pref('browser.migrate.vivaldi.enabled', true);
9+
pref('browser.migrate.opera-gx.enabled', true);
10+
pref('browser.migrate.opera.enabled', true);
11+
712
// Enable downloading DRM.
813
pref('media.eme.enabled', true);
914

@@ -57,10 +62,3 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
5762
pref("extensions.pocket.enabled", false);
5863

5964
#include better-fox.js
60-
RL", "https://discord.gg/Y3khyEtAgS");
61-
pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
62-
63-
// This pref needs to be here to not break context menus (GH#169)
64-
pref("extensions.pocket.enabled", false);
65-
66-
#include better-fox.js

‎src/browser/base/content/browser-sidebar-js.patch‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
2-
index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f587815197 100644
2+
index c5ac301416d2d820ba95e21c0ce1fe305e63b554..fa3cd3184cce8759c834fa0fadc645afde674dd8 100644
33
--- a/browser/base/content/browser-sidebar.js
44
+++ b/browser/base/content/browser-sidebar.js
55
@@ -11,6 +11,10 @@ var SidebarUI = {
@@ -75,7 +75,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
7575
]));
7676
},
7777

78-
@@ -61,7 +97,10 @@ var SidebarUI = {
78+
@@ -61,12 +97,16 @@ var SidebarUI = {
7979
return (this._browser = document.getElementById("sidebar"));
8080
},
8181
POSITION_START_PREF: "sidebar.position_start",
@@ -86,7 +86,13 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
8686

8787
// lastOpenedId is set in show() but unlike currentID it's not cleared out on hide
8888
// and isn't persisted across windows
89-
@@ -76,8 +115,13 @@ var SidebarUI = {
89+
lastOpenedId: null,
90+
91+
+ /** @type {HTMLElement?} */
92+
_box: null,
93+
// The constructor of this label accesses the browser element due to the
94+
// control="sidebar" attribute, so avoid getting this label during startup.
95+
@@ -76,8 +116,13 @@ var SidebarUI = {
9096
}
9197
return (this.__title = document.getElementById("sidebar-title"));
9298
},
@@ -100,7 +106,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
100106
_reversePositionButton: null,
101107
_switcherPanel: null,
102108
_switcherTarget: null,
103-
@@ -110,15 +154,59 @@ var SidebarUI = {
109+
@@ -110,15 +155,59 @@ var SidebarUI = {
104110
this._switcherTarget = document.getElementById("sidebar-switcher-target");
105111
this._switcherArrow = document.getElementById("sidebar-switcher-arrow");
106112

@@ -160,7 +166,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
160166
},
161167

162168
uninit() {
163-
@@ -127,7 +215,10 @@ var SidebarUI = {
169+
@@ -127,7 +216,10 @@ var SidebarUI = {
164170
let enumerator = Services.wm.getEnumerator("navigator:browser");
165171
if (!enumerator.hasMoreElements()) {
166172
let xulStore = Services.xulStore;
@@ -172,7 +178,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
172178

173179
if (this._box.hasAttribute("positionend")) {
174180
xulStore.persist(this._box, "positionend");
175-
@@ -148,6 +239,12 @@ var SidebarUI = {
181+
@@ -148,6 +240,12 @@ var SidebarUI = {
176182
xulStore.persist(this._title, "value");
177183
}
178184

@@ -185,7 +191,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
185191
Services.obs.removeObserver(this, "intl:app-locales-changed");
186192

187193
if (this._observer) {
188-
@@ -159,17 +256,47 @@ var SidebarUI = {
194+
@@ -159,17 +257,62 @@ var SidebarUI = {
189195
/**
190196
* The handler for Services.obs.addObserver.
191197
**/
@@ -230,14 +236,29 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
230236
+ }
231237
+ }
232238
+
239+
+ // The sidebar depends on a browse existing. If this has been
240+
+ // destroyed, we need to re-init it. Although, first we need to
241+
+ // remove any possible cached value
242+
+ this._browser = null
243+
+ if (!this.browser) {
244+
+ /** @type {HTMLElement} */
245+
+ const browser = document.createXULElement('browser')
246+
+ browser.setAttribute('id', 'sidebar')
247+
+ browser.setAttribute('autoscroll', 'false')
248+
+ browser.setAttribute('disablehistory', 'true')
249+
+ browser.setAttribute('disablefullscreen', 'true')
250+
+ browser.setAttribute('tooltip', 'aHTMLTooltip')
251+
+ this._box.appendChild(browser)
252+
+ }
253+
+
233254
+ this.init();
234255
+ break;
235256
+ }
236257
+ break;
237258
}
238259
}
239260
},
240-
@@ -485,6 +612,9 @@ var SidebarUI = {
261+
@@ -485,6 +628,9 @@ var SidebarUI = {
241262
},
242263

243264
_loadSidebarExtension(commandID) {
@@ -247,15 +268,15 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
247268
let sidebar = this.sidebars.get(commandID);
248269
let { extensionId } = sidebar;
249270
if (extensionId) {
250-
@@ -523,6 +653,7 @@ var SidebarUI = {
271+
@@ -523,6 +669,7 @@ var SidebarUI = {
251272
}
252273

253274
this._fireFocusedEvent();
254275
+ this.loadedSidebars.push(commandID);
255276
return true;
256277
});
257278
},
258-
@@ -546,10 +677,28 @@ var SidebarUI = {
279+
@@ -546,10 +693,28 @@ var SidebarUI = {
259280
}
260281
return this._show(commandID).then(() => {
261282
this._loadSidebarExtension(commandID);
@@ -284,7 +305,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
284305
/**
285306
* Implementation for show. Also used internally for sidebars that are shown
286307
* when a window is opened and we don't want to ping telemetry.
287-
@@ -559,6 +708,29 @@ var SidebarUI = {
308+
@@ -559,6 +724,29 @@ var SidebarUI = {
288309
*/
289310
_show(commandID) {
290311
return new Promise(resolve => {
@@ -314,7 +335,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
314335
this.selectMenuItem(commandID);
315336

316337
this._box.hidden = this._splitter.hidden = false;
317-
@@ -570,13 +742,21 @@ var SidebarUI = {
338+
@@ -570,13 +758,21 @@ var SidebarUI = {
318339
this._box.setAttribute("sidebarcommand", commandID);
319340
this.lastOpenedId = commandID;
320341

@@ -338,7 +359,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
338359
this.browser.addEventListener(
339360
"load",
340361
event => {
341-
@@ -615,22 +795,46 @@ var SidebarUI = {
362+
@@ -615,22 +811,46 @@ var SidebarUI = {
342363

343364
this.selectMenuItem("");
344365

@@ -392,7 +413,7 @@ index c5ac301416d2d820ba95e21c0ce1fe305e63b554..4d824259fd611e5531e35bb3d3da85f5
392413
},
393414

394415
/**
395-
@@ -638,25 +842,121 @@ var SidebarUI = {
416+
@@ -638,25 +858,121 @@ var SidebarUI = {
396417
* none if the argument is an empty string.
397418
*/
398419
selectMenuItem(commandID) {
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
2-
index 8dfb7b3c787661b5541d77c0eddf408ee90c513f..2a8c13598f5d047bb2fbcbae0b1ee6032a50e9da 100644
2+
index a775f71d5ca17dfbba4e84ea602c17ee669ab7e4..36f2d1fab395a7a2f3e299b39dfc15187aa9f28a 100644
33
--- a/browser/base/content/browser.xhtml
44
+++ b/browser/base/content/browser.xhtml
5-
@@ -105,6 +105,7 @@
6-
Services.scriptloader.loadSubScript("chrome://browser/content/browser-pageActions.js", this);
5+
@@ -110,6 +110,7 @@
76
Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);
87
Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);
8+
Services.scriptloader.loadSubScript("chrome://browser/content/browser-unified-extensions.js", this);
99
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-verticaltabs.js", this);
1010
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
1111
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser-tab.js", this);
1212
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser-tabs.js", this);
13-
@@ -112,6 +113,7 @@
14-
Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
15-
Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
16-
17-
+
18-
window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
19-
window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
20-
window.onclose = WindowIsClosing;

‎src/browser/base/jar-mn.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
2-
index 4239a2af4952c0c7ceafaae1d614925a960402bc..f53ab91867941b7282d71b4687ae8af7df47e621 100644
2+
index a0e9585076a16f46f0b100f3fdd71896b75d165b..9c8a3abcdb97a968e00c9727c82e2644f9aaf921 100644
33
--- a/browser/base/jar.mn
44
+++ b/browser/base/jar.mn
5-
@@ -58,6 +58,7 @@ browser.jar:
6-
content/browser/browser-toolbarKeyNav.js (content/browser-toolbarKeyNav.js)
5+
@@ -60,6 +60,7 @@ browser.jar:
76
content/browser/browser-thumbnails.js (content/browser-thumbnails.js)
7+
content/browser/browser-unified-extensions.js (content/browser-unified-extensions.js)
88
content/browser/browser-graphics-utils.js (content/browser-graphics-utils.js)
99
+ content/browser/browser-verticaltabs.js (content/browser-verticaltabs.js)
1010
content/browser/browser-webrtc.js (content/browser-webrtc.js)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
2-
index bb0aff1b9e25cce2c8f9c95d73c5be4f63bbe46f..f8d68e0cbe198ca9010884c2e9add5a640e3013b 100644
2+
index 05538be5d95492903e44076dc43e195cbc76c10d..44819694a95e5064078e48a704fa53d46b134c50 100644
33
--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
44
+++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
55
@@ -20,6 +20,7 @@
@@ -9,4 +9,4 @@ index bb0aff1b9e25cce2c8f9c95d73c5be4f63bbe46f..f8d68e0cbe198ca9010884c2e9add5a6
99
+ <script src="chrome://browser/content/contentTheme.js"></script>
1010
</head>
1111

12-
<body class="illustrated">
12+
<body>
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
2-
index 9dde80d165f5815e557c5a050b6edd6568617b95..6778abd79a9c68ff8c457393df1e04c81c29d9b8 100644
2+
index ca4bfcb81b852966a4486d8ec238345f18971f85..738fbe237412aacb4f24c84986c97bac0cf674b4 100644
33
--- a/browser/locales/en-US/browser/browser.ftl
44
+++ b/browser/locales/en-US/browser/browser.ftl
5-
@@ -919,3 +919,6 @@ private-browsing-indicator-label = Private browsing
6-
unified-extensions-button =
7-
.label = Extensions
8-
.tooltiptext = Extensions
5+
@@ -950,3 +950,8 @@ refresh-blocked-redirect-label = { -brand-short-name } prevented this page from
6+
refresh-blocked-allow =
7+
.label = Allow
8+
.accesskey = A
9+
+
910
+
1011
+sidebar-context-delete =
1112
+ .label = Delete
13+
+

0 commit comments

Comments
 (0)