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

Commit 1a1c6c6

Browse files
trickyprtrickypr
committed
👽️ Update patches for 109.0
1 parent 0625d7c commit 1a1c6c6

File tree

5 files changed

+23
-53
lines changed

5 files changed

+23
-53
lines changed

‎src/browser/app/profile/firefox-js.patch‎

Lines changed: 8 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..ff91ce488ddd65c148633eb3e8e65044da47bf37 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,8 @@ 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+
@@ -2156,10 +2153,10 @@ pref("browser.migrate.opera-gx.enabled", false);
43+
pref("browser.migrate.content-modal.enabled", false);
5344

5445
pref("extensions.pocket.api", "api.getpocket.com");
5546
-pref("extensions.pocket.enabled", true);
@@ -61,30 +52,15 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
6152
pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
6253

6354
// Enable Pocket button home panel for non link pages.
64-
@@ -2251,9 +2248,10 @@ pref("toolkit.coverage.enabled", false);
55+
@@ -2290,8 +2287,9 @@ pref("toolkit.coverage.enabled", false);
6556
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
6657

6758
// Discovery prefs
6859
-pref("browser.discovery.enabled", true);
6960
-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
61+
+// From memory, this uses google analytics
8662
+pref("browser.discovery.enabled", false);
8763
+pref("browser.discovery.containers.enabled", false);
64+
pref("browser.discovery.sites", "addons.mozilla.org");
8865

8966
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/base/content/browser-xhtml.patch‎

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)

‎src/browser/components/sessionstore/content/aboutSessionRestore-xhtml.patch‎

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>

‎src/browser/locales/en-US/browser/browser-ftl.patch‎

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)