diff --git a/.gluon/command b/.gluon/command index ac7bcbbf3..8a58e1ae8 100644 --- a/.gluon/command +++ b/.gluon/command @@ -1 +1 @@ -bootstrap \ No newline at end of file +download \ No newline at end of file diff --git a/.gluon/patchCount b/.gluon/patchCount deleted file mode 100644 index c22708346..000000000 --- a/.gluon/patchCount +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/configs/branding/beta/logo.jpeg b/configs/branding/beta/logo.jpeg deleted file mode 100644 index 5109076da..000000000 Binary files a/configs/branding/beta/logo.jpeg and /dev/null differ diff --git a/configs/common/mozconfig b/configs/common/mozconfig index 41381d1a5..4e5ed9f0c 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -14,11 +14,11 @@ export MOZ_MACBUNDLE_ID=${appId} export MOZ_DISTRIBUTION_ID=${appId} # Uncomment if builds are too resource hungry -mk_add_options MOZ_MAKE_FLAGS="-j4" -ac_add_options --enable-linker=gold +# mk_add_options MOZ_MAKE_FLAGS="-j4" +# ac_add_options --enable-linker=gold # Misc export MOZ_STUB_INSTALLER=1 export MOZ_INCLUDE_SOURCE_INFO=1 -export MOZ_SOURCE_REPO=https://github.com/zen-browser/core +export MOZ_SOURCE_REPO=https://github.com/dothq/browser-desktop export MOZ_SOURCE_CHANGESET=${changeset} diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 2287c268b..cf123fcd5 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -1,8 +1,8 @@ -ac_add_options --target=x86_64-pc-mingw32 -ac_add_options --enable-js-shell -ac_add_options --enable-rust-simd -ac_add_options --enable-crashreporter - -# Disable telemetry and tracking -mk_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --target=x86_64-pc-mingw32 +ac_add_options --enable-js-shell +ac_add_options --enable-rust-simd +ac_add_options --enable-crashreporter + +# Disable telemetry and tracking +mk_add_options MOZ_TELEMETRY_REPORTING= mk_add_options MOZ_DATA_REPORTING= \ No newline at end of file diff --git a/gluon.json b/gluon.json index 8891cf58f..4f1fdb9c2 100644 --- a/gluon.json +++ b/gluon.json @@ -2,9 +2,8 @@ "name": "Zen Browser", "vendor": "Zen HQ", "appId": "com.zen.browser", - "binaryName": "zen", "version": { - "product": "firefox-esr-next", + "product": "firefox", "version": "124.0.1", "displayVersion": "1.0.0" }, diff --git a/src/README.md b/src/README.md index e69de29bb..12ea79dd9 100644 --- a/src/README.md +++ b/src/README.md @@ -0,0 +1 @@ +# Melon build tool diff --git a/src/browser/themes/custom/linux/linux.inc.css b/src/browser/themes/custom/linux/linux.inc.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/browser/themes/custom/macos/macos.inc.css b/src/browser/themes/custom/macos/macos.inc.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/browser/themes/custom/shared/shared.inc.css b/src/browser/themes/custom/shared/shared.inc.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/browser/themes/custom/windows/windows.inc.css b/src/browser/themes/custom/windows/windows.inc.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch new file mode 100644 index 000000000..a125f79c9 --- /dev/null +++ b/src/browser/themes/linux/browser-css.patch @@ -0,0 +1,13 @@ +diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css +index ac03145433960f8abcfad5f285545843f02e7f1e..108dc7b290206be7158e914f2760226cb2c219ea 100644 +--- a/browser/themes/linux/browser.css ++++ b/browser/themes/linux/browser.css +@@ -6,6 +6,8 @@ + + @namespace html url("http://www.w3.org/1999/xhtml"); + ++%include ../custom/linux/linux.inc.css ++ + %include ../shared/browser.inc.css + /** + * We intentionally do not include browser-custom-colors.inc.css, diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch new file mode 100644 index 000000000..5e4223386 --- /dev/null +++ b/src/browser/themes/osx/browser-css.patch @@ -0,0 +1,13 @@ +diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css +index 01036f1e2e08f2a033c439ed6796668704e39b02..0e07dc2ae161c0dca88c634577c4788755bf2324 100644 +--- a/browser/themes/osx/browser.css ++++ b/browser/themes/osx/browser.css +@@ -4,6 +4,8 @@ + + @namespace html url("http://www.w3.org/1999/xhtml"); + ++%include ../custom/macos/macos.inc.css ++ + %include ../shared/browser.inc.css + %include ../shared/browser-custom-colors.inc.css + diff --git a/src/browser/themes/shared/browser-inc-css.patch b/src/browser/themes/shared/browser-inc-css.patch new file mode 100644 index 000000000..9bfc59f8a --- /dev/null +++ b/src/browser/themes/shared/browser-inc-css.patch @@ -0,0 +1,13 @@ +diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css +index b345560225ee8619524481c4570540746be9fcba..cafddff0e4febe056fceb35d705f3ef43cc08b1f 100644 +--- a/browser/themes/shared/browser.inc.css ++++ b/browser/themes/shared/browser.inc.css +@@ -2,6 +2,8 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++%include ../custom/shared/shared.inc.css ++ + %include downloads/indicator.inc.css + %include addons/extension-controlled.inc.css + diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch new file mode 100644 index 000000000..34d4b85b7 --- /dev/null +++ b/src/browser/themes/windows/browser-css.patch @@ -0,0 +1,13 @@ +diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css +index 2cb1a094bc42d045992bf42ccd4c79e89795d971..c2fab339d4ddb7dd394d73f686c1b6e569d2a1be 100644 +--- a/browser/themes/windows/browser.css ++++ b/browser/themes/windows/browser.css +@@ -4,6 +4,8 @@ + + @namespace html url("http://www.w3.org/1999/xhtml"); + ++%include ../custom/windows/windows.inc.css ++ + %include ../shared/browser.inc.css + %include ../shared/browser-custom-colors.inc.css + %filter substitution