This commit is contained in:
Bert van der Weerd 2021-07-17 08:59:22 +02:00
parent a66fc42849
commit cafdfb23ac
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
3 changed files with 30 additions and 30 deletions

View file

@ -1,7 +1,7 @@
#!env python3 #!env python3
pkgver = '89.0.2' pkgver = '90.0'
nightly_ver = '91.0a1' nightly_ver = '92.0a1'
# #
# build.py - try move functionality away from that too big/horrible build script. # build.py - try move functionality away from that too big/horrible build script.
@ -260,37 +260,35 @@ def execute_lw_do_patches():
if options.src == 'release': if options.src == 'release':
# production patches # production patches
patches = [ patches = [
"../common/patches/context-menu.patch", "../common/patches/context-menu.patch",
"../common/patches/remove_addons.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/allow_dark_preference_with_rfp.patch",
"../common/patches/about-dialog.patch", "../common/patches/about-dialog.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",
] ]
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", "../common/patches/context-menu.patch",
#"../common/patches/remove_addons.patch", "../patches/remove_addons-91.0a1-nightly.patch",
"../patches/remove_addons-91.0a1-nightly.patch", ##"../common/patches/megabar.patch",
"../common/patches/megabar.patch", "../patches/vpn-patch-91.0a1-nightly.patch",
#"../common/patches/mozilla-vpn-ad.patch", "../common/patches/allow_dark_preference_with_rfp.patch",
"../patches/vpn-patch-91.0a1-nightly.patch", "../common/patches/about-dialog.patch",
"../common/patches/allow_dark_preference_with_rfp.patch",
"../common/patches/about-dialog.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",
] ]
@ -407,7 +405,9 @@ def execute_lw_artifacts():
exec("sed \"s/pkg_version/{}/g\" < setup.nsi > tmp.nsi".format(s)) exec("sed \"s/pkg_version/{}/g\" < setup.nsi > tmp.nsi".format(s))
exec("makensis-3.01.exe -V1 tmp.nsi") exec("makensis-3.01.exe -V1 tmp.nsi")
exec("rm -f tmp.nsi") exec("rm -f tmp.nsi")
exec("mv librewolf-{}.en-US.win64-setup.exe {}".format(s,setupname)) from_name = 'librewolf-{}.en-US.win64-setup.exe'.format(s)
if from_name != setupname:
exec("mv {} {}".format(from_name,setupname))
if os.path.isfile("tmp.exe"): if os.path.isfile("tmp.exe"):
exec("mv tmp.exe librewolf-{}.en-US.win64-setup.exe".format(pkgver)) exec("mv tmp.exe librewolf-{}.en-US.win64-setup.exe".format(pkgver))

2
common

@ -1 +1 @@
Subproject commit 7f197653262e6513adcf75d4d7addc584a2545c1 Subproject commit 7294ed9baae68dd215607315bb94a9345ec68114

@ -1 +1 @@
Subproject commit 26665d7a19796dd11288018bd8d354ed9ac048d9 Subproject commit 39575257b2746036420998d51ad4c84450ff5a85