This commit is contained in:
Bert van der Weerd 2021-06-14 16:19:04 +02:00
parent 862b95a65e
commit 16888df744
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
3 changed files with 27 additions and 16 deletions

2
common

@ -1 +1 @@
Subproject commit 92b53ba4f78e870c0404a51961e3eadffda8c258 Subproject commit 100780c6ce47f5d0d60ba4da4f316dae2c161d1b

View file

@ -80,6 +80,9 @@ def execute_update_submodules():
exec("git submodule foreach git merge origin master") exec("git submodule foreach git merge origin master")
def execute_git_init(): def execute_git_init():
if options.src != 'release':
print("fatal error: git_init only works with the release source (--src release)")
sys.exit(1)
enter_srcdir() enter_srcdir()
exec("rm -rf .git") exec("rm -rf .git")
exec("git init") exec("git init")
@ -210,21 +213,29 @@ def execute_lw_do_patches():
exec("cp -vr ../common/source_files/* .") exec("cp -vr ../common/source_files/* .")
exec("cp -v ../files/configure.sh browser/branding/librewolf") exec("cp -v ../files/configure.sh browser/branding/librewolf")
# patches.. patches = [
patch("../common/patches/context-menu.patch") "../common/patches/context-menu.patch",
patch("../common/patches/remove_addons.patch") "../common/patches/remove_addons.patch",
patch("../common/patches/megabar.patch") "../common/patches/megabar.patch",
patch("../common/patches/mozilla-vpn-ad.patch") "../common/patches/mozilla-vpn-ad.patch",
"../common/patches/allow_dark_preference_with_rfp.patch",
"../common/patches/about-dialog.patch",
# sed patches.. # sed patches..
patch("../common/patches/sed-patches/allow-searchengines-non-esr.patch") "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
patch("../common/patches/sed-patches/disable-pocket.patch") "../common/patches/sed-patches/disable-pocket.patch",
patch("../common/patches/sed-patches/remove-internal-plugin-certs.patch") "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
patch("../common/patches/sed-patches/stop-undesired-requests.patch") "../common/patches/sed-patches/stop-undesired-requests.patch",
]
for p in patches:
patch(p)
# local windows patches # local windows patches
patch("../patches/browser-confvars.patch") # not sure about this one yet! for p in ["../patches/browser-confvars.patch", "../patches/package-manifest.patch"]:
patch("../patches/package-manifest.patch") # let ./mach package pick up our added files patch(p)
leave_srcdir() leave_srcdir()

@ -1 +1 @@
Subproject commit 0532d6cb861db42f3ccfbb3a90908e7cc9f31013 Subproject commit 3cb605955b2598e111ff79b3c38eb726226f9cf9