diff --git a/patches/msix.patch b/patches/msix.patch index 48e128f..d76f797 100644 --- a/patches/msix.patch +++ b/patches/msix.patch @@ -2,107 +2,20 @@ # # Author: Malte Jürgens # Description: Allows us to build a msix for the Microsoft Store -# Last Updated: 2023-01-26 +# Last Updated: 2023-02-26 # License: MPL 2.0 --- a/browser/installer/windows/msix/AppxManifest.xml.in +++ b/browser/installer/windows/msix/AppxManifest.xml.in -@@ -1,7 +1,6 @@ - -- -+ - - - -- -+ - - @APPX_DISPLAYNAME@ - @APPX_PUBLISHER_DISPLAY_NAME@ -@@ -25,27 +25,34 @@ - - - --@APPX_RESOURCE_LANGUAGE_LIST@ -+ @APPX_RESOURCE_LANGUAGE_LIST@ - - -- -+ - - - +@@ -35,7 +35,7 @@ -- + - -- -+ -+ -+ ++ + -- -- -- -+ -+ -+ - - - - -- -+ - - - -@@ -54,9 +61,10 @@ - - - -+ https://searchfox.org/mozilla-central/source/browser/installer/windows/nsis/shared.nsh -+ and `os.environment.launched_to_handle` and `os.environment.invoked_to_handle` -+ telemetry in -+ https://searchfox.org/mozilla-central/source/browser/components/BrowserContentHandler.jsm. --> - .avif - .htm - .html -@@ -95,44 +103,18 @@ - - - -+ AppId="@MOZ_INOTIFICATIONACTIVATION_CLSID@"> - -+ Path="VFS\ProgramFiles\@APPX_INSTDIR@\notificationserver.dll" -+ ThreadingModel="Both" /> - - - - -- -+ - + +@@ -108,31 +108,4 @@ @@ -133,9 +46,7 @@ - - - -- -+ -\ No newline at end of file + --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -2325,7 +2325,7 @@ def repackage_msi(