Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 05:33:03 -05:00
Code Issues Activity

fix msix patch

Browse source
This commit is contained in:
Malte Jürgens 2023-04-11 20:33:05 +02:00
parent 9979337c8e
commit 8dcab4dffe
No known key found for this signature in database
GPG key ID: D29FBD5F93C0CFC3
1 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
patches/msix.patch
View file

@ -56,7 +56,7 @@
</Package>
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -2325,7 +2325,7 @@ def repackage_msi(
@@ -2493,7 +2493,7 @@ def repackage_msi(
@CommandArgument(
"--vendor",
type=str,
@ -65,7 +65,7 @@
required=False,
help="The vendor to use in the Package/Identity/Name string to use in the App Manifest."
+ " Defaults to 'Mozilla'.",
@@ -2462,7 +2462,7 @@ def repackage_msix(
@@ -2630,7 +2630,7 @@ def repackage_msix(
command_context.topsrcdir,
channel=channel,
arch=arch,
@ -76,16 +76,7 @@
publisher_display_name=publisher_display_name,
--- a/python/mozbuild/mozbuild/repackaging/msix.py
+++ b/python/mozbuild/mozbuild/repackaging/msix.py
@@ -97,7 +97,7 @@ def find_sdk_tool(binary, log=None):
finder = FileFinder(sdk)
# TODO: handle running on ARM.
- is_64bits = sys.maxsize > 2 ** 32
+ is_64bits = sys.maxsize > 2**32
arch = "x64" if is_64bits else "x86"
for p, f in finder.find(
@@ -122,68 +122,19 @@ def get_embedded_version(version, buildid):
@@ -105,68 +105,19 @@ def get_embedded_version(version, buildid):
the dotted quad to be identically 0, so we enforce that here.
"""
@ -165,7 +156,28 @@
def get_appconstants_sys_mjs_values(finder, *args):
@@ -417,12 +368,7 @@ def repackage_msix(
@@ -193,9 +144,9 @@ def get_appconstants_sys_mjs_values(finder, *args):
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 +205,7 @@ def get_branding(use_official, build_app, finder, log=None):
},
"{branding_reason}; Using branding from '{branding}'.",
)
- return branding
+ return mozpath.join(topsrcdir, branding)
def unpack_msix(input_msix, output, log=None, verbose=False):
@@ -404,12 +355,7 @@ def repackage_msix(
)
first = next(values)
@ -179,30 +191,7 @@
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 @@
@@ -471,8 +417,8 @@ def repackage_msix(
# Release (official) and Beta share branding. Differentiate Beta a little bit.
brandFullName += " Beta"