diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 16ebb2d2c..027331bc9 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -274,13 +274,12 @@ jobs: name: com.zen.browser.flatpak path: com.zen.browser.flatpak - - name: Push flatpak repo - run: | - git config --global user.email "mauro-balades@users.noreply.github.com" - git config --global user.name "mauro-balades" - git add ./repo - git commit -m "Update flatpak repo" - git push + - name: Publish to Flathub (beta) + uses: flatpak/flatpak-github-actions/flat-manager@v6.1 + with: + flat-manager-url: https://hub.flathub.org/ + repository: beta + token: ${{ secrets.FLATHUB_TOKEN }} release: if: ${{ github.event.inputs.create_release == 'true' }} diff --git a/configs/common/mozconfig b/configs/common/mozconfig index c26989b7b..caf39c6bb 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -12,9 +12,7 @@ export MOZ_APP_PROFILE=${binName} export MOZ_APP_DISPLAYNAME="${name}" export MOZ_BRANDING_DIRECTORY=${brandingDir} export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir} -export MOZ_MACBUNDLE_ID=${appId} export MOZ_DISTRIBUTION_ID=${appId} -export MOZ_MACBUNDLE_NAME="Zen Browser.app" # Uncomment if builds are too resource hungry # mk_add_options MOZ_MAKE_FLAGS="-j4" @@ -38,7 +36,8 @@ if test "$ZEN_RELEASE"; then ac_add_options --disable-tests ac_add_options --enable-strip ac_add_options --enable-install-strip - + ac_add_options --disable-accessibility + ac_add_options --enable-rust-simd mk_add_options MOZ_PARALLEL_COMPILE=1 mk_add_options MOZ_CRASHREPORTER=0 @@ -55,15 +54,11 @@ if test "$ZEN_RELEASE"; then ac_add_options --disable-rust-tests ac_add_options --disable-default-browser-agent - export MOZ_LTO=thin - ac_add_options MOZ_LTO=thin - ac_add_options --enable-lto=thin + export MOZ_LTO=1 + ac_add_options MOZ_LTO=1 + ac_add_options --enable-lto - if test "$ZEN_CROSS_COMPILING"; then - ac_add_options --disable-jemalloc - else - ac_add_options --enable-jemalloc - fi + ac_add_options --enable-jemalloc mk_add_options MOZILLA_OFFICIAL=1 MOZILLA_OFFICIAL=1 @@ -91,6 +86,7 @@ ac_add_options --enable-jxl ac_add_options --enable-av1 ac_add_options --enable-eme=widevine +ac_add_options --allow-addon-sideload ac_add_options --with-unsigned-addon-scopes=app,system export MOZ_REQUIRE_SIGNING= diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index b5249a1f9..5f566557c 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -7,3 +7,6 @@ POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-gre ac_add_options --enable-install-strip ac_add_options --target=aarch64-apple-darwin + +export MOZ_MACBUNDLE_ID=${appId} +export MOZ_MACBUNDLE_NAME="Zen Browser.app" diff --git a/src/toolkit/mozapps/update/updater/updater-common-build.patch b/src/toolkit/mozapps/update/updater/updater-common-build.patch new file mode 100644 index 000000000..ce7193d25 --- /dev/null +++ b/src/toolkit/mozapps/update/updater/updater-common-build.patch @@ -0,0 +1,16 @@ +diff --git a/toolkit/mozapps/update/updater/updater-common.build b/toolkit/mozapps/update/updater/updater-common.build +index 6c6d0adf6f56b66c06494b95982b4afae52de536..67e381659dba0c6938a12d16fe12bc2f3e2039ae 100644 +--- a/toolkit/mozapps/update/updater/updater-common.build ++++ b/toolkit/mozapps/update/updater/updater-common.build +@@ -78,6 +78,11 @@ if link_with_nss: + "nss", + "signmar", + ] ++ if CONFIG["OS_ARCH"] == "Linux": ++ # Zen: --enable-unverified-updates is enabled, the RPATH is not added ++ OS_LIBS += [ ++ "-Wl,-rpath=\\$$ORIGIN", ++ ] + + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + have_progressui = 1