diff --git a/.vscode/settings.json b/.vscode/settings.json index aea013817..a71c154eb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,6 +17,14 @@ "string": "cpp", "string_view": "cpp", "span": "cpp", - "vector": "cpp" + "vector": "cpp", + "charconv": "cpp", + "chrono": "cpp", + "optional": "cpp", + "format": "cpp", + "ratio": "cpp", + "system_error": "cpp", + "regex": "cpp", + "type_traits": "cpp" } } diff --git a/README.md b/README.md index 9bb3a8778..a0c112610 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,21 @@ You can also install Zen using Homebrew: brew install --cask zen-browser ``` +### Linux + +#### AppImage + +- `zsync` is required for the Update feature of the script below + +``` +bash <(curl https://updates.zen-browser.app/appimage.sh) +``` + +#### Flatpak +``` +flatpak install flathub io.github.zen_browser.zen +``` + To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`. # Core Components diff --git a/l10n b/l10n index 57a77d3dc..39b011023 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 57a77d3dc93f11e771a11317f10a31e9f6a532c6 +Subproject commit 39b011023d038fb8bb58eece6113919eb5c52770 diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index e39319d72..679b1e681 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index b8aa71126c2bb4521caf25f9caf845a8a429dc64..59cdc2e9998e802d6c79ff967eaa30088a3b7a21 100644 +index a39a4f287ef843f7e0cdeac8320eeff81318116f..f84cdb85c249221522089667010d547cfab67819 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -3110,3 +3110,5 @@ pref("toolkit.contentRelevancy.enabled", false); +@@ -3190,3 +3190,5 @@ pref("toolkit.contentRelevancy.enabled", false); pref("toolkit.contentRelevancy.ingestEnabled", false); // Pref to enable extra logging for the content relevancy feature pref("toolkit.contentRelevancy.log", false); diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs index d567f87a0..40d87ef70 100644 --- a/src/browser/base/content/ZenUIManager.mjs +++ b/src/browser/base/content/ZenUIManager.mjs @@ -169,7 +169,8 @@ var gZenCompactModeManager = { flashSidebar() { let sidebar = document.getElementById('navigator-toolbox'); - if (sidebar.matches(':hover')) { + let tabPanels = document.getElementById('tabbrowser-tabpanels'); + if (sidebar.matches(':hover') || tabPanels.matches("[zen-split-view='true']")) { return; } if (this._flashSidebarTimeout) { diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 4101126d5..64768bd51 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 4101126d541ba234c4b0892b19c7ddedadcffd95 +Subproject commit 64768bd518043029665f7cb914d5e801d1f20497 diff --git a/src/toolkit/modules/AppConstants-sys-mjs.patch b/src/toolkit/modules/AppConstants-sys-mjs.patch new file mode 100644 index 000000000..5ab1dfcfa --- /dev/null +++ b/src/toolkit/modules/AppConstants-sys-mjs.patch @@ -0,0 +1,13 @@ +diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs +index a20e45c6135d24e42594700fe57184a560facd0f..7650dd88dc67d774c3af05704f2539ff92e21be2 100644 +--- a/toolkit/modules/AppConstants.sys.mjs ++++ b/toolkit/modules/AppConstants.sys.mjs +@@ -338,6 +338,8 @@ export var AppConstants = Object.freeze({ + MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@", + MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@", + ++ ZEN_FIREFOX_VERSION: "@ZEN_FIREFOX_VERSION@", ++ + DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@", + + MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@", diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch new file mode 100644 index 000000000..822947a0a --- /dev/null +++ b/src/toolkit/modules/moz-build.patch @@ -0,0 +1,12 @@ +diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build +index 6ba1e92026f6f1618ce3a477f74bb6d0fa20f7c1..ccf3fa076771da7c9a5cb2bb732558cb73d810af 100644 +--- a/toolkit/modules/moz.build ++++ b/toolkit/modules/moz.build +@@ -281,6 +281,7 @@ for var in ( + "DLL_SUFFIX", + "DEBUG_JS_MODULES", + "OMNIJAR_NAME", ++ "ZEN_FIREFOX_VERSION" + ): + DEFINES[var] = CONFIG[var] or "" + diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch index 037e9f032..a2b529500 100644 --- a/src/toolkit/moz-configure.patch +++ b/src/toolkit/moz-configure.patch @@ -1,8 +1,22 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index dfef4ee7bd74a232f8f9eaa158303e59a2a32e62..77864261c8dbf2947738b97733553da67608c060 100644 +index 1f85d2831f2f71ebe4c7216bd604926d71e5189e..fb0d07554a592339f5a794151d953cb9269afd75 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -905,9 +905,9 @@ set_define("MOZ_AV1", av1) +@@ -81,6 +81,13 @@ option( + ) + set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO") + ++option( ++ env="ZEN_FIREFOX_VERSION", ++ default="130.0", ++ help="Set the version of the browser", ++) ++set_config("ZEN_FIREFOX_VERSION", "130.0", when="ZEN_FIREFOX_VERSION") ++ + option( + "--with-distribution-id", + nargs=1, +@@ -905,9 +912,9 @@ set_define("MOZ_AV1", av1) option("--disable-jxl", help="Disable jxl image support") diff --git a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch new file mode 100644 index 000000000..6c76c73d5 --- /dev/null +++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch @@ -0,0 +1,13 @@ +diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs +index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7bf0ed025 100644 +--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs ++++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs +@@ -1214,7 +1214,7 @@ var AddonManagerInternal = { + ITEM_VERSION: aAddon.version, + ITEM_STATUS: addonStatus, + APP_ID: Services.appinfo.ID, +- APP_VERSION: aAppVersion ? aAppVersion : Services.appinfo.version, ++ APP_VERSION: AppConstants.ZEN_FIREFOX_VERSION, + REQ_VERSION: UPDATE_REQUEST_VERSION, + APP_OS: Services.appinfo.OS, + APP_ABI: Services.appinfo.XPCOMABI,