From f215e436e6a2806d4a8b160477df52a7e54798a8 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 00:59:16 +1100 Subject: [PATCH 1/5] Upgrade to 106.0.5 --- gluon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon.json b/gluon.json index b40270aa..8490d1c4 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "105.0.1" + "version": "106.0.5" }, "buildOptions": { "generateBranding": true From 073537871b4419f4da78c84d25e58fda10c9e95a Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 00:59:42 +1100 Subject: [PATCH 2/5] Fix Patches --- src/browser/components/BrowserGlue-jsm.patch | 28 ++++++++++---------- src/browser/components/moz-build.patch | 6 ++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch index 87ff46d0..80c8cb45 100644 --- a/src/browser/components/BrowserGlue-jsm.patch +++ b/src/browser/components/BrowserGlue-jsm.patch @@ -1,20 +1,20 @@ diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm -index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72dba02320 100644 +index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54c17b6180 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm -@@ -4321,6 +4321,23 @@ BrowserGlue.prototype = { +@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = { }, async _maybeShowDefaultBrowserPrompt() { + // ========================================================================= + // Pulse browser welcome -+ ++ + const welcomeEnabledPref = 'pulse.welcome.enabled' + const welcomeSeenPref = 'pulse.welcome.seen' -+ ++ + // NOTE: Get bool prefs takes in two options, the pref string and a default + // value if it is not defined -+ ++ + const welcomeEnabled = Services.prefs.getBoolPref(welcomeEnabledPref, true) + const welcomeSeen = Services.prefs.getBoolPref(welcomeSeenPref, false) + @@ -22,24 +22,24 @@ index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72 + this._showWelcomeDialog() + + // ========================================================================= ++ + // Highest priority is the upgrade dialog, which can include a "primary // browser" request and is limited in various ways, e.g., major upgrades. - const dialogVersion = 100; -@@ -4780,6 +4797,18 @@ BrowserGlue.prototype = { + const dialogVersion = 106; +@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = { "nsIObserver", "nsISupportsWeakReference", ]), -+ + /** -+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. -+ * -+ * @todo Add gluon docs for how to show custom popups on startup -+ * @patch Pulse Browser -+ */ ++ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. ++ * ++ * @todo Add gluon docs for how to show custom popups on startup ++ * @patch Pulse Browser ++ */ + _showWelcomeDialog() { + lazy.BrowserWindowTracker.getTopWindow().gDialogBox.open( -+ "chrome://browser/content/welcome/welcome.html" ++ "chrome://browser/content/welcome/welcome.html" + ); + }, }; diff --git a/src/browser/components/moz-build.patch b/src/browser/components/moz-build.patch index 6fb2867a..71be36ce 100644 --- a/src/browser/components/moz-build.patch +++ b/src/browser/components/moz-build.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/moz.build b/browser/components/moz.build -index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0ad198b50a 100644 +index 3b2126e66efa27d4b941ceb93b46a04aa3cdef30..bbc1b8b248f32bf17764813402abf224b4bc38c1 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build -@@ -60,6 +60,9 @@ DIRS += [ +@@ -63,6 +63,9 @@ DIRS += [ "urlbar", ] @@ -11,4 +11,4 @@ index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0a + DIRS += ["build"] - if CONFIG["NIGHTLY_BUILD"]: + From 1c133130e68448931c24d47457708c28f4332002 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:18:43 +1100 Subject: [PATCH 3/5] Remove Firefox-view --- src/browser/app/profile/firefox-js.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index cfc1229c..933e3a26 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 e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e3351ec7c 100644 +index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -19,6 +19,8 @@ @@ -19,6 +19,15 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing"); // Enable extensionStorage storage actor by default +@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); + pref("browser.tabs.tooltipsShowPidAndActiveness", false); + #endif + +-pref("browser.tabs.firefox-view", true); ++pref("browser.tabs.firefox-view", false); + pref("browser.tabs.firefox-view.logLevel", "Warn"); + + // allow_eval_* is enabled on Firefox Desktop only at this @@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua"); @@ -49,7 +58,7 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e // Enable Pocket button home panel for non link pages. pref("extensions.pocket.showHome", true); -@@ -2246,9 +2238,6 @@ pref("toolkit.coverage.enabled", false); +@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false); pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); // Discovery prefs From d775d5544f4f4c8ef646232a6f4cf67cecaa0310 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Fri, 11 Nov 2022 18:21:04 +1100 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Triggered?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/components/BrowserGlue-jsm.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch index 80c8cb45..8ef65748 100644 --- a/src/browser/components/BrowserGlue-jsm.patch +++ b/src/browser/components/BrowserGlue-jsm.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm -index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54c17b6180 100644 +index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -4343,6 +4343,24 @@ BrowserGlue.prototype = { @@ -32,7 +32,7 @@ index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54 "nsISupportsWeakReference", ]), + /** -+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. ++ * Displays the welcome dialog. Triggered `_maybeShowDefaultBrowserPrompt`. + * + * @todo Add gluon docs for how to show custom popups on startup + * @patch Pulse Browser From 160ac926431766787927dbf1a2aab6c5c5f9d794 Mon Sep 17 00:00:00 2001 From: trickypr Date: Sun, 13 Nov 2022 20:01:12 +1100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20Fix=20set=20default=20search?= =?UTF-8?q?=20engine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/components/welcome/welcome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/components/welcome/welcome.js b/src/browser/components/welcome/welcome.js index 046475ce..215f697e 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) + await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER) } }