diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-05-03 11:00:45 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-05-03 11:00:45 -0500 |
| commit | 15ad3ef57a5703c33251d989756a158ce2500f49 (patch) | |
| tree | 80f24dfe962f74f5061c5a3fb59b51a5597abade | |
| parent | d785b558814f32d13c05f3cb8ee80088fbccec35 (diff) | |
| download | aura-central-15ad3ef57a5703c33251d989756a158ce2500f49.tar.gz | |
[System:Packager] Update 7zstub
| -rw-r--r-- | other-licenses/7zstub/binoc/7zSD.manifest | 29 | ||||
| -rw-r--r-- | other-licenses/7zstub/binoc/7zSD.sfx | bin | 458240 -> 183296 bytes | |||
| -rw-r--r-- | other-licenses/7zstub/default/7zSD.sfx (renamed from other-licenses/7zstub/gre/7zSD.sfx) | bin | 156672 -> 183296 bytes | |||
| -rw-r--r-- | other-licenses/7zstub/gre/7zSD.manifest | 29 | ||||
| -rw-r--r-- | system/packager/base.mk | 2 |
5 files changed, 1 insertions, 59 deletions
diff --git a/other-licenses/7zstub/binoc/7zSD.manifest b/other-licenses/7zstub/binoc/7zSD.manifest deleted file mode 100644 index 14639d7f5..000000000 --- a/other-licenses/7zstub/binoc/7zSD.manifest +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="7zS.sfx.exe" type="win32"/>
-<description>7-Zip Self-extracting Archive v18.05</description>
-<dependency>
-<dependentAssembly>
-<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/>
-</dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-<security>
-<requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-</requestedPrivileges>
-</security>
-</trustInfo>
-<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-<application>
-<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-</application>
-</compatibility>
-<application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings>
-<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-</windowsSettings>
-</application>
-</assembly>
diff --git a/other-licenses/7zstub/binoc/7zSD.sfx b/other-licenses/7zstub/binoc/7zSD.sfx Binary files differindex 1b003c05f..2f7d3607d 100644 --- a/other-licenses/7zstub/binoc/7zSD.sfx +++ b/other-licenses/7zstub/binoc/7zSD.sfx diff --git a/other-licenses/7zstub/gre/7zSD.sfx b/other-licenses/7zstub/default/7zSD.sfx Binary files differindex 97c9b38d5..beed92b64 100644 --- a/other-licenses/7zstub/gre/7zSD.sfx +++ b/other-licenses/7zstub/default/7zSD.sfx diff --git a/other-licenses/7zstub/gre/7zSD.manifest b/other-licenses/7zstub/gre/7zSD.manifest deleted file mode 100644 index 14639d7f5..000000000 --- a/other-licenses/7zstub/gre/7zSD.manifest +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="7zS.sfx.exe" type="win32"/>
-<description>7-Zip Self-extracting Archive v18.05</description>
-<dependency>
-<dependentAssembly>
-<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/>
-</dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-<security>
-<requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-</requestedPrivileges>
-</security>
-</trustInfo>
-<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-<application>
-<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-</application>
-</compatibility>
-<application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings>
-<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-</windowsSettings>
-</application>
-</assembly>
diff --git a/system/packager/base.mk b/system/packager/base.mk index 58d54a079..a389bd2d8 100644 --- a/system/packager/base.mk +++ b/system/packager/base.mk @@ -220,7 +220,7 @@ ifdef MAKENSISU DEFINES += -DHAVE_MAKENSISU=1 CONFIG_DIR = instgen ifndef SFX_MODULE -SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/gre/7zSD.sfx +SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/default/7zSD.sfx endif # SFX_MODULE endif # MAKENSISU |