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:
Malte Jürgens
parent
585207f290
commit
3c1900c964
1 changed files with 8 additions and 97 deletions
|
|
@ -2,107 +2,20 @@
|
|||
#
|
||||
# Author: Malte Jürgens <maltejur@dismail.de>
|
||||
# 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 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
-- License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
-- You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
+<!-- This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy
|
||||
+of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<!-- #filter substitution -->
|
||||
<Package
|
||||
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
|
||||
@@ -14,7 +13,8 @@
|
||||
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
|
||||
IgnorableNamespaces="uap uap2 uap3 uap10 rescap">
|
||||
|
||||
- <Identity Name="@APPX_IDENTITY@" Publisher="@APPX_PUBLISHER@" Version="@APPX_VERSION@" ProcessorArchitecture="@APPX_ARCH@" />
|
||||
+ <Identity Name="@APPX_IDENTITY@" Publisher="@APPX_PUBLISHER@" Version="@APPX_VERSION@"
|
||||
+ ProcessorArchitecture="@APPX_ARCH@" />
|
||||
<Properties>
|
||||
<DisplayName>@APPX_DISPLAYNAME@</DisplayName>
|
||||
<PublisherDisplayName>@APPX_PUBLISHER_DISPLAY_NAME@</PublisherDisplayName>
|
||||
@@ -25,27 +25,34 @@
|
||||
</uap10:PackageIntegrity>
|
||||
</Properties>
|
||||
<Resources>
|
||||
-@APPX_RESOURCE_LANGUAGE_LIST@
|
||||
+ @APPX_RESOURCE_LANGUAGE_LIST@
|
||||
</Resources>
|
||||
<Dependencies>
|
||||
- <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.1" />
|
||||
+ <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0"
|
||||
+ MaxVersionTested="10.0.19041.1" />
|
||||
</Dependencies>
|
||||
<Capabilities>
|
||||
<rescap:Capability Name="runFullTrust" />
|
||||
@@ -35,7 +35,7 @@
|
||||
</Capabilities>
|
||||
<Applications>
|
||||
- <Application Id="App" Executable="VFS\ProgramFiles\@APPX_INSTDIR@\@MOZ_APP_NAME@.exe" EntryPoint="Windows.FullTrustApplication">
|
||||
<Application Id="App" Executable="VFS\ProgramFiles\@APPX_INSTDIR@\@MOZ_APP_NAME@.exe" EntryPoint="Windows.FullTrustApplication">
|
||||
- <uap:VisualElements BackgroundColor="#20123A" DisplayName="@MOZ_APP_DISPLAYNAME@" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="@MOZ_APP_DISPLAYNAME@">
|
||||
- <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
|
||||
+ <Application Id="App" Executable="VFS\ProgramFiles\@APPX_INSTDIR@\@MOZ_APP_NAME@.exe"
|
||||
+ EntryPoint="Windows.FullTrustApplication">
|
||||
+ <uap:VisualElements BackgroundColor="#FFFFFF" DisplayName="@MOZ_APP_DISPLAYNAME@"
|
||||
+ Square150x150Logo="Assets\Square150x150Logo.png"
|
||||
+ Square44x44Logo="Assets\Square44x44Logo.png" Description="@MOZ_APP_DISPLAYNAME@">
|
||||
+ <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"
|
||||
+ Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
|
||||
+ <uap:VisualElements BackgroundColor="#FFFFFF" DisplayName="@MOZ_APP_DISPLAYNAME@" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="@MOZ_APP_DISPLAYNAME@">
|
||||
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
|
||||
<uap:ShowNameOnTiles>
|
||||
- <uap:ShowOn Tile="square150x150Logo"/>
|
||||
- <uap:ShowOn Tile="wide310x150Logo"/>
|
||||
- <uap:ShowOn Tile="square310x310Logo"/>
|
||||
+ <uap:ShowOn Tile="square150x150Logo" />
|
||||
+ <uap:ShowOn Tile="wide310x150Logo" />
|
||||
+ <uap:ShowOn Tile="square310x310Logo" />
|
||||
</uap:ShowNameOnTiles>
|
||||
</uap:DefaultTile>
|
||||
</uap:VisualElements>
|
||||
<Extensions>
|
||||
- <uap3:Extension Category="windows.appExecutionAlias" EntryPoint="Windows.FullTrustApplication" Executable="VFS\ProgramFiles\@APPX_INSTDIR@\@MOZ_APP_NAME@.exe">
|
||||
+ <uap3:Extension Category="windows.appExecutionAlias"
|
||||
+ EntryPoint="Windows.FullTrustApplication"
|
||||
+ Executable="VFS\ProgramFiles\@APPX_INSTDIR@\@MOZ_APP_NAME@.exe">
|
||||
<uap3:AppExecutionAlias>
|
||||
<desktop:ExecutionAlias Alias="@MOZ_APP_NAME@.exe" />
|
||||
</uap3:AppExecutionAlias>
|
||||
@@ -54,9 +61,10 @@
|
||||
<uap3:FileTypeAssociation Name="htm">
|
||||
<uap:SupportedFileTypes>
|
||||
<!-- Keep synchronized with
|
||||
- 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. -->
|
||||
+ 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. -->
|
||||
<uap:FileType>.avif</uap:FileType>
|
||||
<uap:FileType>.htm</uap:FileType>
|
||||
<uap:FileType>.html</uap:FileType>
|
||||
@@ -95,44 +103,18 @@
|
||||
<com:Extension Category="windows.comServer">
|
||||
<com:ComServer>
|
||||
<com:SurrogateServer DisplayName="NotificationServer"
|
||||
- AppId="@MOZ_INOTIFICATIONACTIVATION_CLSID@">
|
||||
+ AppId="@MOZ_INOTIFICATIONACTIVATION_CLSID@">
|
||||
<com:Class Id="@MOZ_INOTIFICATIONACTIVATION_CLSID@"
|
||||
- Path="VFS\ProgramFiles\@APPX_INSTDIR@\notificationserver.dll"
|
||||
- ThreadingModel="Both" />
|
||||
+ Path="VFS\ProgramFiles\@APPX_INSTDIR@\notificationserver.dll"
|
||||
+ ThreadingModel="Both" />
|
||||
</com:SurrogateServer>
|
||||
</com:ComServer>
|
||||
</com:Extension>
|
||||
<desktop:Extension Category="windows.toastNotificationActivation">
|
||||
- <desktop:ToastNotificationActivation ToastActivatorCLSID="@MOZ_INOTIFICATIONACTIVATION_CLSID@" />
|
||||
+ <desktop:ToastNotificationActivation
|
||||
+ ToastActivatorCLSID="@MOZ_INOTIFICATIONACTIVATION_CLSID@" />
|
||||
</desktop:Extension>
|
||||
<uap:ShowOn Tile="square150x150Logo"/>
|
||||
@@ -108,31 +108,4 @@
|
||||
</Extensions>
|
||||
</Application>
|
||||
</Applications>
|
||||
|
|
@ -133,9 +46,7 @@
|
|||
- </com:ComInterface>
|
||||
- </com:Extension>
|
||||
- </Extensions>
|
||||
-</Package>
|
||||
+</Package>
|
||||
\ No newline at end of file
|
||||
</Package>
|
||||
--- a/python/mozbuild/mozbuild/mach_commands.py
|
||||
+++ b/python/mozbuild/mozbuild/mach_commands.py
|
||||
@@ -2325,7 +2325,7 @@ def repackage_msi(
|
||||
|
|
|
|||
Loading…
Reference in a new issue