updates
This commit is contained in:
parent
a7ef564050
commit
3eb92f29ca
2 changed files with 56 additions and 13 deletions
27
build.py
27
build.py
|
|
@ -62,7 +62,7 @@ def exec(cmd):
|
||||||
|
|
||||||
def patch(patchfile):
|
def patch(patchfile):
|
||||||
cmd = "patch -p1 -i {}".format(patchfile)
|
cmd = "patch -p1 -i {}".format(patchfile)
|
||||||
print(cmd)
|
print("\n*** -> {}".format(cmd))
|
||||||
if not options.no_execute:
|
if not options.no_execute:
|
||||||
retval = os.system(cmd)
|
retval = os.system(cmd)
|
||||||
if retval != 0:
|
if retval != 0:
|
||||||
|
|
@ -211,10 +211,14 @@ def execute_lw_do_patches():
|
||||||
# create the right mozconfig file..
|
# create the right mozconfig file..
|
||||||
create_mozconfig(mozconfig_release)
|
create_mozconfig(mozconfig_release)
|
||||||
|
|
||||||
|
|
||||||
# copy branding files..
|
# copy branding files..
|
||||||
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")
|
||||||
|
|
||||||
|
|
||||||
|
if options.src == 'release':
|
||||||
|
# production patches
|
||||||
patches = [
|
patches = [
|
||||||
"../common/patches/context-menu.patch",
|
"../common/patches/context-menu.patch",
|
||||||
"../common/patches/remove_addons.patch",
|
"../common/patches/remove_addons.patch",
|
||||||
|
|
@ -230,6 +234,27 @@ def execute_lw_do_patches():
|
||||||
"../common/patches/sed-patches/stop-undesired-requests.patch",
|
"../common/patches/sed-patches/stop-undesired-requests.patch",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
elif options.src == 'nightly':
|
||||||
|
# patches for future releases are caught with nightly
|
||||||
|
patches = [
|
||||||
|
"../common/patches/context-menu.patch",
|
||||||
|
"../common/patches/remove_addons.patch",
|
||||||
|
"../common/patches/megabar.patch",
|
||||||
|
#"../common/patches/mozilla-vpn-ad.patch",
|
||||||
|
"../patches/vpn-patch-91.0a1-nightly.patch",
|
||||||
|
"../common/patches/allow_dark_preference_with_rfp.patch",
|
||||||
|
"../common/patches/about-dialog.patch",
|
||||||
|
|
||||||
|
# sed patches..
|
||||||
|
"../common/patches/sed-patches/allow-searchengines-non-esr.patch",
|
||||||
|
"../common/patches/sed-patches/disable-pocket.patch",
|
||||||
|
"../common/patches/sed-patches/remove-internal-plugin-certs.patch",
|
||||||
|
"../common/patches/sed-patches/stop-undesired-requests.patch",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for p in patches:
|
for p in patches:
|
||||||
patch(p)
|
patch(p)
|
||||||
|
|
||||||
|
|
|
||||||
18
patches/vpn-patch-91.0a1-nightly.patch
Normal file
18
patches/vpn-patch-91.0a1-nightly.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
diff -r 536a892dd51f browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||||
|
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html Tue Jun 22 16:56:13 2021 +0000
|
||||||
|
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html Wed Jun 23 07:09:38 2021 +0200
|
||||||
|
@@ -58,6 +58,7 @@
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
+ <!--
|
||||||
|
<div class="promo">
|
||||||
|
<div class="promo-image-large">
|
||||||
|
<img src="" alt="" />
|
||||||
|
@@ -73,5 +74,6 @@
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
+ -->
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Loading…
Add table
Reference in a new issue