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

Commit 30c87a2

Browse files
authored
🔀 Update firefox to 108.0.1 (#175)
108.0
2 parents 2daf8f6 + b84b053 commit 30c87a2

File tree

9 files changed

+72
-63
lines changed

9 files changed

+72
-63
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": "107.0"
8+
"version": "108.0.1"
99
},
1010
"buildOptions": {
1111
"generateBranding": true
@@ -99,4 +99,4 @@
9999
"licenseType": "MPL-2.0"
100100
},
101101
"updateHostname": "updates.pulsebrowser.app"
102-
}
102+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/xpcom/idl-parser/xpidl/xpidl.py b/xpcom/idl-parser/xpidl/xpidl.py
2+
--- a/xpcom/idl-parser/xpidl/xpidl.py
3+
+++ b/xpcom/idl-parser/xpidl/xpidl.py
4+
@@ -1637,17 +1637,17 @@
5+
literals = '"(){}[]<>,;:=|+-*'
6+
7+
t_ignore = " \t"
8+
9+
def t_multilinecomment(self, t):
10+
- r"/\*(?s).*?\*/"
11+
+ r"/\*(\n|.)*?\*/"
12+
t.lexer.lineno += t.value.count("\n")
13+
if t.value.startswith("/**"):
14+
self._doccomments.append(t.value)
15+
16+
def t_singlelinecomment(self, t):
17+
- r"(?m)//.*?$"
18+
+ r"//[^\n]*"
19+
20+
def t_IID(self, t):
21+
return t
22+
23+
t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar}
24+
@@ -1656,11 +1656,11 @@
25+
r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501
26+
t.type = self.keywords.get(t.value, "IDENTIFIER")
27+
return t
28+
29+
def t_LCDATA(self, t):
30+
- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
31+
+ r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?"
32+
t.type = "CDATA"
33+
t.value = t.lexer.lexmatch.group("cdata")
34+
t.lexer.lineno += t.value.count("\n")
35+
return t
36+
37+

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

Lines changed: 10 additions & 11 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..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644
2+
index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c37b23031 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
55
@@ -19,6 +19,8 @@
@@ -48,21 +48,20 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117
4848
#if defined(XP_LINUX) || defined(XP_WIN)
4949
// Allows us to adjust the priority of child processes at the OS level
5050
pref("dom.ipc.processPriorityManager.enabled", true);
51-
@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
52-
pref("browser.migrate.chrome.history.maxAgeInDays", 180);
51+
@@ -2117,10 +2114,10 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 180);
5352
pref("browser.migrate.showBookmarksToolbarAfterMigration", true);
5453

55-
-pref("extensions.pocket.api", "api.getpocket.com");
54+
pref("extensions.pocket.api", "api.getpocket.com");
5655
-pref("extensions.pocket.enabled", true);
57-
-pref("extensions.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
58-
-pref("extensions.pocket.site", "getpocket.com");
56+
+pref("extensions.pocket.enabled", false);
57+
pref("extensions.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
58+
pref("extensions.pocket.site", "getpocket.com");
5959
-pref("extensions.pocket.onSaveRecs", true);
60-
-pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
61-
-
62-
// Enable Pocket button home panel for non link pages.
63-
pref("extensions.pocket.showHome", true);
60+
+pref("extensions.pocket.onSaveRecs", false);
61+
pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
6462

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

6867
// Discovery prefs

‎src/browser/components/customizableui/CustomizableUI-jsm.patch‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
2-
index 00e8533bc51245f3d55cefa3f20fc588c0e49c70..fd11b297a715f8861fc34c89861f726d1fd9336f 100644
2+
index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259aceef48f 100644
33
--- a/browser/components/customizableui/CustomizableUI.jsm
44
+++ b/browser/components/customizableui/CustomizableUI.jsm
5-
@@ -18,6 +18,7 @@ const lazy = {};
6-
XPCOMUtils.defineLazyModuleGetters(lazy, {
7-
AddonManager: "resource://gre/modules/AddonManager.jsm",
5+
@@ -24,6 +24,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
86
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
9-
+ ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
107
SearchWidgetTracker: "resource:///modules/SearchWidgetTracker.jsm",
118
CustomizableWidgets: "resource:///modules/CustomizableWidgets.jsm",
9+
+ ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
1210
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
13-
@@ -34,6 +35,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() {
11+
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
12+
HomePage: "resource:///modules/HomePage.jsm",
13+
@@ -36,6 +37,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() {
1414
});
1515

1616
const kDefaultThemeID = "default-theme@mozilla.org";
1717
+const kUBlockOriginID = "uBlock0@raymondhill.net";
1818

1919
const kSpecialWidgetPfx = "customizableui-special-";
2020

21-
@@ -231,17 +233,21 @@ var CustomizableUIInternal = {
22-
true
21+
@@ -253,17 +255,19 @@ var CustomizableUIInternal = {
22+
false
2323
);
2424

2525
+ const { makeWidgetId } = lazy.ExtensionCommon;
@@ -33,8 +33,6 @@ index 00e8533bc51245f3d55cefa3f20fc588c0e49c70..fd11b297a715f8861fc34c89861f726d
3333
? null
3434
: "home-button",
3535
"spring",
36-
+ // TODO: Would be nice if this was moved to an extension API rather than
37-
+ // manually being edited here...
3836
+ `${makeWidgetId(kUBlockOriginID)}-browser-action`,
3937
"urlbar-container",
4038
"spring",

‎src/browser/components/welcome/welcome.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class EngineStore {
6565
}
6666

6767
async setDefaultEngine(engine) {
68-
await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER)
68+
await Services.search.setDefault(engine.originalEngine, Ci.nsISearchService.CHANGE_REASON_USER)
6969
}
7070
}
7171

‎src/browser/themes/pulse/addons/shared.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,9 @@ tab[pending],
253253
#alltabs-popup menuitem[pending] {
254254
opacity: 0.6 !important;
255255
}
256+
257+
/* Hide the firefox view button */
258+
:root:not([privatebrowsingmode="temporary"]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, :root[privatebrowsingmode="temporary"] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
259+
border-inline-start: none;
260+
}
261+

‎src/python/mozboot/mozboot/osx-py.patch‎

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
2-
index c0c6e76515978b05ae9ed0281f0106469df2b573..12f3a1820f79430f5baeaf7ad51dcf61c1bb0c29 100644
2+
index 858bfc466ef610b18de4bb9408f00d42312cc0f2..62e55efc6b15fb183d43c47fed4538dc0ab71f38 100644
33
--- a/toolkit/modules/moz.build
44
+++ b/toolkit/modules/moz.build
55
@@ -160,6 +160,7 @@ EXTRA_JS_MODULES += [
66
"Color.sys.mjs",
7-
"Console.jsm",
8-
"ContentDOMReference.jsm",
7+
"Console.sys.mjs",
8+
"ContentDOMReference.sys.mjs",
99
+ "ContextMenu.jsm",
1010
"CreditCard.sys.mjs",
1111
"DateTimePickerPanel.sys.mjs",
12-
"DeferredTask.jsm",
12+
"DeferredTask.sys.mjs",

‎src/toolkit/themes/shared/in-content/common-shared-css.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
2-
index 81c4390ccc5fa063bfe055cbca72b5935dd7966b..bec9dc48d01b5a7abc059f037271026b7b1b22c3 100644
2+
index 35597e57e2af87d44b5b6f984c50705f70745d73..b2f69caa83256374e5a5d51e5b9203eb0193b1bc 100644
33
--- a/toolkit/themes/shared/in-content/common-shared.css
44
+++ b/toolkit/themes/shared/in-content/common-shared.css
5-
@@ -268,8 +268,6 @@
5+
@@ -261,8 +261,6 @@
66
:root {
77
font: message-box;
88
appearance: none;
99
- background-color: var(--in-content-page-background);
1010
- color: var(--in-content-page-color);
11+
-moz-box-layout: flex;
1112
}
1213

13-
:root:not(.system-font-size) {
14-
@@ -278,6 +276,8 @@
14+
@@ -272,6 +270,8 @@
1515

1616
html|body {
1717
margin: 0;

0 commit comments

Comments
 (0)