mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 13:43:04 -05:00
update msix patch
This commit is contained in:
parent
e3ee78ba04
commit
cacd9b7356
1 changed files with 35 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# Author: Malte Jürgens <maltejur@dismail.de>
|
||||
# Description: Allows us to build a msix for the Microsoft Store
|
||||
# Last Updated: 2023-02-26
|
||||
# Last Updated: 2023-03-11
|
||||
# License: MPL 2.0
|
||||
--- a/browser/installer/windows/msix/AppxManifest.xml.in
|
||||
+++ b/browser/installer/windows/msix/AppxManifest.xml.in
|
||||
|
@ -179,3 +179,37 @@
|
|||
|
||||
second = next(values)
|
||||
vendor = vendor or second
|
||||
--- a/python/mozbuild/mozbuild/repackaging/msix.py
|
||||
+++ b/python/mozbuild/mozbuild/repackaging/msix.py
|
||||
@@ -193,9 +193,9 @@
|
||||
yield value
|
||||
|
||||
|
||||
-def get_branding(use_official, build_app, finder, log=None):
|
||||
+def get_branding(use_official, topsrcdir, build_app, finder, log=None):
|
||||
"""Figure out which branding directory to use."""
|
||||
- conf_vars = mozpath.join(build_app, "confvars.sh")
|
||||
+ conf_vars = mozpath.join(topsrcdir, build_app, "confvars.sh")
|
||||
|
||||
def conf_vars_value(key):
|
||||
lines = open(conf_vars).readlines()
|
||||
@@ -254,7 +254,7 @@
|
||||
},
|
||||
"{branding_reason}; Using branding from '{branding}'.",
|
||||
)
|
||||
- return branding
|
||||
+ return mozpath.join(topsrcdir, branding)
|
||||
|
||||
|
||||
def unpack_msix(input_msix, output, log=None, verbose=False):
|
||||
@@ -471,8 +471,8 @@
|
||||
# Release (official) and Beta share branding. Differentiate Beta a little bit.
|
||||
brandFullName += " Beta"
|
||||
|
||||
- branding = os.path.join(
|
||||
- topsrcdir, get_branding(use_official_branding, build_app, unpack_finder, log)
|
||||
+ branding = get_branding(
|
||||
+ use_official_branding, topsrcdir, build_app, unpack_finder, log
|
||||
)
|
||||
if not os.path.isdir(branding):
|
||||
raise Exception("branding dir {} does not exist".format(branding))
|
||||
|
|
Loading…
Reference in a new issue