changes to which patches get applied

This commit is contained in:
Bert van der Weerd 2021-09-16 07:04:42 +02:00
parent 8961b3265c
commit 456a600397
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 17 additions and 11 deletions

View file

@ -268,12 +268,15 @@ def execute_lw_do_patches():
if options.src == 'release': if options.src == 'release':
# production patches # production patches
patches = [ patches = [
"../common/patches/about-dialog.patch",
"../common/patches/allow_dark_preference_with_rfp.patch",
# "../common/patches/browser-confvars.patch",
"../common/patches/context-menu.patch", "../common/patches/context-menu.patch",
"../common/patches/remove_addons.patch",
"../common/patches/megabar.patch", "../common/patches/megabar.patch",
"../common/patches/mozilla-vpn-ad.patch", "../common/patches/mozilla-vpn-ad.patch",
"../common/patches/allow_dark_preference_with_rfp.patch", "../common/patches/mozilla_dirs.patch",
"../common/patches/about-dialog.patch", "../common/patches/remove_addons.patch",
"../common/patches/search-config.patch",
# sed patches.. # sed patches..
"../common/patches/sed-patches/allow-searchengines-non-esr.patch", "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
@ -285,18 +288,21 @@ def execute_lw_do_patches():
elif options.src == 'nightly' or options.src == 'gecko-dev': elif options.src == 'nightly' or options.src == 'gecko-dev':
# patches for future releases are caught with nightly # patches for future releases are caught with nightly
patches = [ patches = [
"../common/patches/context-menu.patch",
"../patches/remove_addons-91.0a1-nightly.patch",
##"../common/patches/megabar.patch",
"../patches/vpn-patch-91.0a1-nightly.patch",
"../common/patches/allow_dark_preference_with_rfp.patch",
"../common/patches/about-dialog.patch", "../common/patches/about-dialog.patch",
"../common/patches/allow_dark_preference_with_rfp.patch",
# "../common/patches/browser-confvars.patch",
"../common/patches/context-menu.patch",
"../common/patches/megabar.patch",
"../common/patches/mozilla-vpn-ad.patch",
"../common/patches/mozilla_dirs.patch",
"../common/patches/remove_addons.patch",
"../common/patches/search-config.patch",
# sed patches.. # sed patches..
"../common/patches/sed-patches/allow-searchengines-non-esr.patch", "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
"../common/patches/sed-patches/disable-pocket.patch", "../common/patches/sed-patches/disable-pocket.patch",
"../common/patches/sed-patches/remove-internal-plugin-certs.patch", "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
##"../common/patches/sed-patches/stop-undesired-requests.patch", "../common/patches/sed-patches/stop-undesired-requests.patch",
] ]

2
common

@ -1 +1 @@
Subproject commit 8403388baf642fd5cbb44a5698c84092210cb802 Subproject commit 0ed87656757aa23b9475c354fe708a26bdecc6a8