From 3ce1d993623ee74e21f27b437ed75c7148f899ed Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sun, 11 Dec 2022 21:55:04 +1100 Subject: [PATCH 1/7] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20firefox=20to?= =?UTF-8?q?=20107.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon.json b/gluon.json index 545e8c3b..6898146f 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "107.0" + "version": "107.0.1" }, "buildOptions": { "generateBranding": true @@ -99,4 +99,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} \ No newline at end of file +} From aa021bbd71d614a3c263b0ff06aa42e3ac4daa52 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sun, 11 Dec 2022 21:56:23 +1100 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=90=9B=20Fix=20builds=20on=20Python?= =?UTF-8?q?=203.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is on the nightly branch, but has not reached stable yet. Whenever this patch causes a conflict, just remove it --- src/D161738 - Python 3.11 fix.patch | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/D161738 - Python 3.11 fix.patch diff --git a/src/D161738 - Python 3.11 fix.patch b/src/D161738 - Python 3.11 fix.patch new file mode 100644 index 00000000..a0808571 --- /dev/null +++ b/src/D161738 - Python 3.11 fix.patch @@ -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.*?\n?)%\}[ ]*(C\+\+)?" ++ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" + t.type = "CDATA" + t.value = t.lexer.lexmatch.group("cdata") + t.lexer.lineno += t.value.count("\n") + return t + + From 88cbf9be4751a0cfcb9eedbe10fac1a31b4509fc Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sun, 11 Dec 2022 22:16:53 +1100 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9B=20Fix=20other=20issues=20stemm?= =?UTF-8?q?ing=20from=20pocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/app/profile/firefox-js.patch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index f49777a8..353694ea 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -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 @@ @@ -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 From fe80763923eaf4767e4581dcb821fc7b92199452 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 17 Dec 2022 15:29:18 +1100 Subject: [PATCH 4/7] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20firefox=20to?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon.json b/gluon.json index 6898146f..a751f557 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "107.0.1" + "version": "108.0.1" }, "buildOptions": { "generateBranding": true From 7441eed43bb15853064eb33c4a619254e0d2de67 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 17 Dec 2022 15:49:31 +1100 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Update=20patches=20?= =?UTF-8?q?for=20108?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customizableui/CustomizableUI-jsm.patch | 18 +++++------ src/python/mozboot/mozboot/osx-py.patch | 31 ------------------- src/toolkit/modules/moz-build.patch | 8 ++--- 3 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 src/python/mozboot/mozboot/osx-py.patch diff --git a/src/browser/components/customizableui/CustomizableUI-jsm.patch b/src/browser/components/customizableui/CustomizableUI-jsm.patch index 1714851c..88a85889 100644 --- a/src/browser/components/customizableui/CustomizableUI-jsm.patch +++ b/src/browser/components/customizableui/CustomizableUI-jsm.patch @@ -1,16 +1,16 @@ 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"; @@ -18,8 +18,8 @@ index 00e8533bc51245f3d55cefa3f20fc588c0e49c70..fd11b297a715f8861fc34c89861f726d const kSpecialWidgetPfx = "customizableui-special-"; -@@ -231,17 +233,21 @@ var CustomizableUIInternal = { - true +@@ -253,17 +255,19 @@ var CustomizableUIInternal = { + false ); + const { makeWidgetId } = lazy.ExtensionCommon; @@ -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", diff --git a/src/python/mozboot/mozboot/osx-py.patch b/src/python/mozboot/mozboot/osx-py.patch deleted file mode 100644 index e4d6aca2..00000000 --- a/src/python/mozboot/mozboot/osx-py.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py -index 8c8c478d2ef6bb7a0ba45a67cfb694d13fce3716..82ed833ea14db8de47e5aec9dd0f049e99b5973c 100644 ---- a/python/mozboot/mozboot/osx.py -+++ b/python/mozboot/mozboot/osx.py -@@ -284,16 +284,23 @@ class OSXBootstrapper(OSXAndroidBootstrapper, BaseBootstrapper): - self.install_homebrew() - - def ensure_clang_static_analysis_package(self): -- from mozboot import static_analysis -+ # NOTE: This function has been removed as it caused numerous problems -+ # with the boostrap process for v100.0.2. May be fixed in the future, -+ # so we can return it -+ pass -+ # from mozboot import static_analysis - -- self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY) -+ # self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY) - - def ensure_sccache_packages(self): - from mozboot import sccache - - self.install_toolchain_artifact("sccache") - self.install_toolchain_artifact(sccache.RUSTC_DIST_TOOLCHAIN, no_unpack=True) -- self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True) -+ # NOTE: This function has been removed as it caused numerous problems -+ # with the boostrap process for v100.0.2. May be fixed in the future, -+ # so we can return it -+ # self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True) - - def ensure_fix_stacks_packages(self): - self.install_toolchain_artifact("fix-stacks") diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch index b6d46b5d..22fac08d 100644 --- a/src/toolkit/modules/moz-build.patch +++ b/src/toolkit/modules/moz-build.patch @@ -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", From 1684e2721c0a36ab11f200eb8a18bca64bb1d1c0 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 17 Dec 2022 16:17:59 +1100 Subject: [PATCH 6/7] Assorted fixes --- src/browser/components/welcome/welcome.js | 2 +- src/browser/themes/pulse/addons/shared.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/browser/components/welcome/welcome.js b/src/browser/components/welcome/welcome.js index 215f697e..255ba01d 100644 --- a/src/browser/components/welcome/welcome.js +++ b/src/browser/components/welcome/welcome.js @@ -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) } } diff --git a/src/browser/themes/pulse/addons/shared.css b/src/browser/themes/pulse/addons/shared.css index ac843daa..32e60b99 100644 --- a/src/browser/themes/pulse/addons/shared.css +++ b/src/browser/themes/pulse/addons/shared.css @@ -236,3 +236,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; +} + From b84b053a4c38544043df3063a5bcaf7a68f122f2 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 17 Dec 2022 16:29:19 +1100 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Fix=20patches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/shared/in-content/common-shared-css.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/toolkit/themes/shared/in-content/common-shared-css.patch b/src/toolkit/themes/shared/in-content/common-shared-css.patch index fac0e2e8..2717855d 100644 --- a/src/toolkit/themes/shared/in-content/common-shared-css.patch +++ b/src/toolkit/themes/shared/in-content/common-shared-css.patch @@ -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;