diff --git a/gluon.json b/gluon.json index 6c9adfd0c..adfb0a622 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "zen", "version": { "product": "firefox", - "version": "124.0.2", + "version": "125.0.1", "displayVersion": "1.0.0" }, "buildOptions": { diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index 4940a7bb8..cec24c263 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,10 +1,10 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 5964d40ca3a3654f8fdc62d87deb0ac51c9a55ab..fdaa15ecaff403d61ec6d4f068678b56442dd28a 100644 +index 1ef5a05907f4675e4e7191dde12c33dc6da5e3c6..69279a1a1278b7034df24b9763c5722a6c623bbc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -3022,3 +3022,5 @@ pref("browser.mailto.dualPrompt.os", false); - // When visiting a site which uses registerProtocolHandler: Ask the user to set Firefox as - // default mailto handler. - pref("browser.mailto.prompt.os", true); +@@ -3037,3 +3037,5 @@ pref("browser.profiles.enabled", false); + + pref("startup.homepage_override_url_nimbus", ""); + pref("startup.homepage_override_nimbus_maxVersion", ""); + +#include zen-browser.js diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 4359da914..04c78c122 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -46,6 +46,7 @@ pref('browser.urlbar.unitConversion.enabled', true); pref('browser.urlbar.trending.featureGate', false); pref('browser.urlbar.weather.featureGate', true); pref('browser.urlbar.quickactions.enabled', true); +pref('browser.urlbar.clipboard.featureGate', true); // new tab page pref('browser.newtabpage.activity-stream.feeds.topsites', false); @@ -133,3 +134,5 @@ pref('dom.enable_web_task_scheduling', true); pref('layout.css.has-selector.enabled', true); pref('dom.security.sanitizer.enabled', true); +// Pref to enable the new profiles (TODO: Check this out!) +//pref("browser.profiles.enabled", true); \ No newline at end of file diff --git a/src/browser/components/customizableui/PanelMultiView-sys-mjs.patch b/src/browser/components/customizableui/PanelMultiView-sys-mjs.patch deleted file mode 100644 index c71d703ac..000000000 --- a/src/browser/components/customizableui/PanelMultiView-sys-mjs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/components/customizableui/PanelMultiView.sys.mjs b/browser/components/customizableui/PanelMultiView.sys.mjs -index a97889f08a61e68ebf5bc5d3749362a40d48bb77..5770b0e86bbe01180c174f5d512133c577c4e0ac 100644 ---- a/browser/components/customizableui/PanelMultiView.sys.mjs -+++ b/browser/components/customizableui/PanelMultiView.sys.mjs -@@ -1205,7 +1205,7 @@ export var PanelMultiView = class extends AssociatedToNode { - } else { - let anchorScreenBottom = anchor.screenY + anchorRect.height; - let cssAvailHeight = availHeight.value / screen.defaultCSSScaleFactor; -- maxHeight = cssAvailTop + cssAvailHeight - anchorScreenBottom; -+ maxHeight = cssAvailTop + cssAvailHeight; - } - - // To go from the maximum height of the panel to the maximum height of diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch index 132f0d6ee..42727afa3 100644 --- a/src/browser/components/preferences/preferences-js.patch +++ b/src/browser/components/preferences/preferences-js.patch @@ -1,12 +1,12 @@ diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index 31ae84f3820aa12a26e10b27718bdc7da277f31b..427d44698ffe5d8154c5503a415ce9ec98982f3b 100644 +index c30a51c67ce636fa889090419a5c2642d74b4f49..b48ab31c564db4a4911c9fca291b4f09ba1025af 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js -@@ -205,6 +205,7 @@ function init_all() { - register_module("panePrivacy", gPrivacyPane); - register_module("paneContainers", gContainersPane); - register_module("paneTranslations", gTranslationsPane); +@@ -198,6 +198,7 @@ function init_all() { + // the entire document. + Preferences.queueUpdateOfAllElements(); + Services.telemetry.setEventRecordingEnabled("aboutpreferences", true); + register_module("paneZenLooks", gZenLooksAndFeel); - if (Services.prefs.getBoolPref("browser.preferences.experimental")) { - // Set hidden based on previous load's hidden value. - document.getElementById("category-experimental").hidden = + + register_module("paneGeneral", gMainPane); + register_module("paneHome", gHomePane); diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch index 4df149129..011008e60 100644 --- a/src/browser/components/preferences/preferences-xhtml.patch +++ b/src/browser/components/preferences/preferences-xhtml.patch @@ -1,35 +1,17 @@ diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index 38fba9a7265cbcec406fd4145014083286fa798e..c54b900f0329c95ae706eb6df42fd7f7e2dc41c9 100644 +index eee227822a772bec128d6adbe4f6aca90ed810f6..54d0f2df0c422a7d8ae0fbe10ef6c072bd7d6453 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml -@@ -42,6 +42,10 @@ - href="chrome://browser/skin/preferences/containers.css" +@@ -43,6 +43,8 @@ /> -+ ++#include zen-preferences-links.xhtml ++ -@@ -52,6 +56,7 @@ - - - -+ - - - -@@ -84,6 +89,7 @@ - -