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

108.0 #175

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gluon.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"binaryName": "pulse-browser",
"version": {
"product": "firefox",
"version": "107.0"
"version": "108.0.1"
},
"buildOptions": {
"generateBranding": true
Expand Down Expand Up @@ -99,4 +99,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.pulsebrowser.app"
}
}
37 changes: 37 additions & 0 deletions src/D161738 - Python 3.11 fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/xpcom/idl-parser/xpidl/xpidl.py b/xpcom/idl-parser/xpidl/xpidl.py
--- a/xpcom/idl-parser/xpidl/xpidl.py
+++ b/xpcom/idl-parser/xpidl/xpidl.py
@@ -1637,17 +1637,17 @@
literals = '"(){}[]<>,;:=|+-*'

t_ignore = " \t"

def t_multilinecomment(self, t):
- r"/\*(?s).*?\*/"
+ r"/\*(\n|.)*?\*/"
t.lexer.lineno += t.value.count("\n")
if t.value.startswith("/**"):
self._doccomments.append(t.value)

def t_singlelinecomment(self, t):
- r"(?m)//.*?$"
+ r"//[^\n]*"

def t_IID(self, t):
return t

t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar}
@@ -1656,11 +1656,11 @@
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
t.type = self.keywords.get(t.value, "IDENTIFIER")
return t

def t_LCDATA(self, t):
- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
+ r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?"
t.type = "CDATA"
t.value = t.lexer.lexmatch.group("cdata")
t.lexer.lineno += t.value.count("\n")
return t


21 changes: 10 additions & 11 deletions src/browser/app/profile/firefox-js.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644
index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c37b23031 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -19,6 +19,8 @@
Expand Down Expand Up @@ -48,21 +48,20 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117
#if defined(XP_LINUX) || defined(XP_WIN)
// Allows us to adjust the priority of child processes at the OS level
pref("dom.ipc.processPriorityManager.enabled", true);
@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
pref("browser.migrate.chrome.history.maxAgeInDays", 180);
@@ -2117,10 +2114,10 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 180);
pref("browser.migrate.showBookmarksToolbarAfterMigration", true);

-pref("extensions.pocket.api", "api.getpocket.com");
pref("extensions.pocket.api", "api.getpocket.com");
-pref("extensions.pocket.enabled", true);
-pref("extensions.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
-pref("extensions.pocket.site", "getpocket.com");
+pref("extensions.pocket.enabled", false);
pref("extensions.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
pref("extensions.pocket.site", "getpocket.com");
-pref("extensions.pocket.onSaveRecs", true);
-pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
-
// Enable Pocket button home panel for non link pages.
pref("extensions.pocket.showHome", true);
+pref("extensions.pocket.onSaveRecs", false);
pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");

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

// Discovery prefs
Expand Down
18 changes: 8 additions & 10 deletions src/browser/components/customizableui/CustomizableUI-jsm.patch
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index 00e8533bc51245f3d55cefa3f20fc588c0e49c70..fd11b297a715f8861fc34c89861f726d1fd9336f 100644
index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259aceef48f 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -18,6 +18,7 @@ const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -24,6 +24,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
+ ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
SearchWidgetTracker: "resource:///modules/SearchWidgetTracker.jsm",
CustomizableWidgets: "resource:///modules/CustomizableWidgets.jsm",
+ ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
@@ -34,6 +35,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() {
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
HomePage: "resource:///modules/HomePage.jsm",
@@ -36,6 +37,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() {
});

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

const kSpecialWidgetPfx = "customizableui-special-";

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

+ const { makeWidgetId } = lazy.ExtensionCommon;
Expand All @@ -33,8 +33,6 @@ index 00e8533bc51245f3d55cefa3f20fc588c0e49c70..fd11b297a715f8861fc34c89861f726d
? null
: "home-button",
"spring",
+ // TODO: Would be nice if this was moved to an extension API rather than
+ // manually being edited here...
+ `${makeWidgetId(kUBlockOriginID)}-browser-action`,
"urlbar-container",
"spring",
Expand Down
2 changes: 1 addition & 1 deletion src/browser/components/welcome/welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class EngineStore {
}

async setDefaultEngine(engine) {
await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER)
await Services.search.setDefault(engine.originalEngine, Ci.nsISearchService.CHANGE_REASON_USER)
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/browser/themes/pulse/addons/shared.css
Original file line number Diff line number Diff line change
Expand Up @@ -253,3 +253,9 @@ tab[pending],
#alltabs-popup menuitem[pending] {
opacity: 0.6 !important;
}

/* Hide the firefox view button */
: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 {
border-inline-start: none;
}

31 changes: 0 additions & 31 deletions src/python/mozboot/mozboot/osx-py.patch

This file was deleted.

8 changes: 4 additions & 4 deletions src/toolkit/modules/moz-build.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index c0c6e76515978b05ae9ed0281f0106469df2b573..12f3a1820f79430f5baeaf7ad51dcf61c1bb0c29 100644
index 858bfc466ef610b18de4bb9408f00d42312cc0f2..62e55efc6b15fb183d43c47fed4538dc0ab71f38 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -160,6 +160,7 @@ EXTRA_JS_MODULES += [
"Color.sys.mjs",
"Console.jsm",
"ContentDOMReference.jsm",
"Console.sys.mjs",
"ContentDOMReference.sys.mjs",
+ "ContextMenu.jsm",
"CreditCard.sys.mjs",
"DateTimePickerPanel.sys.mjs",
"DeferredTask.jsm",
"DeferredTask.sys.mjs",
8 changes: 4 additions & 4 deletions src/toolkit/themes/shared/in-content/common-shared-css.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
index 81c4390ccc5fa063bfe055cbca72b5935dd7966b..bec9dc48d01b5a7abc059f037271026b7b1b22c3 100644
index 35597e57e2af87d44b5b6f984c50705f70745d73..b2f69caa83256374e5a5d51e5b9203eb0193b1bc 100644
--- a/toolkit/themes/shared/in-content/common-shared.css
+++ b/toolkit/themes/shared/in-content/common-shared.css
@@ -268,8 +268,6 @@
@@ -261,8 +261,6 @@
:root {
font: message-box;
appearance: none;
- background-color: var(--in-content-page-background);
- color: var(--in-content-page-color);
-moz-box-layout: flex;
}

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

html|body {
margin: 0;
Expand Down