From d048271c5381931bcad8a87c9ecd513bcc93f631 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 3 Jun 2021 10:12:13 +0200 Subject: [PATCH] Building v91.0a1 nightly for v89.0 release --- build.sh | 30 +++++++++--------------------- mozconfigs.sh | 2 +- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/build.sh b/build.sh index 067bc53..9dd993e 100755 --- a/build.sh +++ b/build.sh @@ -83,28 +83,15 @@ do_patches() { echo 'Applying patches...' - - - if [ "$srcdir" == "mozilla-unified" ]; then - patch -p1 -i ../common/patches/nightly/context-menu2.patch - patch -p1 -i ../common/patches/nightly/report-site-issue.patch - patch -p1 -i ../common/patches/nightly/megabar3.patch - else - echo "patch -p1 -i ../common/patches/nightly/context-menu2.patch" - patch -p1 -i ../common/patches/nightly/context-menu2.patch - # patch -p1 -i ../common/patches/context-menu.patch + echo "patch -p1 -i ../common/patches/nightly/context-menu2.patch" + patch -p1 -i ../common/patches/nightly/context-menu2.patch + echo "patch -p1 -i ../common/patches/remove_addons.patch" + patch -p1 -i ../common/patches/remove_addons.patch + echo 'patch -p1 -i ../common/patches/nightly/megabar3.patch' + patch -p1 -i ../common/patches/nightly/megabar3.patch + echo "patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch" + patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch - echo "patch -p1 -i ../common/patches/remove_addons.patch" - patch -p1 -i ../common/patches/remove_addons.patch -# echo "patch -p1 -i ../common/patches/megabar.patch" -# patch -p1 -i ../common/patches/megabar.patch - echo 'patch -p1 -i ../common/patches/nightly/megabar3.patch' - patch -p1 -i ../common/patches/nightly/megabar3.patch - - echo "patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch" - patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch - fi - echo 'GNU sed patches...' echo 'patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch' @@ -119,6 +106,7 @@ do_patches() { echo 'Local patches...' # local win10 patches + echo 'patch -p1 -i ../patches/browser-confvars.patch' patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet! cd .. diff --git a/mozconfigs.sh b/mozconfigs.sh index 8efa4d2..db3c41c 100644 --- a/mozconfigs.sh +++ b/mozconfigs.sh @@ -20,7 +20,7 @@ ac_add_options --with-branding=browser/branding/librewolf ac_add_options --with-distribution-id=io.gitlab.librewolf-community ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --allow-addon-sideload -export MOZ_REQUIRE_SIGNING=0 +#export MOZ_REQUIRE_SIGNING=0 # Features ac_add_options --disable-crashreporter