Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Closed
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": "107.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
3 changes: 3 additions & 0 deletions src/browser/app/profile/pulse-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,7 @@ pref("app.update.url.details", "hhttps://pulsebrowser.app/download");
pref("app.releaseNotesURL", "https://discord.gg/Y3khyEtAgS");
pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");

// This pref needs to be here to not break context menus (GH#169)
pref("extensions.pocket.enabled", false);

#include better-fox.js