mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 07:38:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[7zip] Update to 23.01 (#33437)

Browse Source 
* update all 7zip related stuff

* v db

* remove unnecessary line from testing

* fix 7zip build

* v db
This commit is contained in:
Alexander Neumann 2023-08-30 22:43:31 +02:00 committed by GitHub
parent 1cffda373b
commit 82c68e296d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/7zip/CMakeLists.txt
View File

@ -10,6 +10,7 @@ endif()
add_library(7zip)
# Check makefile in srcdir/CPP/7zip/Archive/7z/makefile
target_sources(7zip PRIVATE
CPP/7zip/Compress/Bcj2Coder.cpp
CPP/7zip/Compress/Bcj2Register.cpp
@ -23,6 +24,7 @@ target_sources(7zip PRIVATE
CPP/7zip/Compress/BZip2Decoder.cpp
CPP/7zip/Compress/BZip2Encoder.cpp
CPP/7zip/Compress/BZip2Register.cpp
CPP/7zip/Compress/CodecExports.cpp
CPP/7zip/Compress/CopyCoder.cpp
CPP/7zip/Compress/CopyRegister.cpp
CPP/7zip/Compress/Deflate64Register.cpp
@ -30,7 +32,10 @@ target_sources(7zip PRIVATE
CPP/7zip/Compress/DeflateEncoder.cpp
CPP/7zip/Compress/DeflateRegister.cpp
CPP/7zip/Compress/DeltaFilter.cpp
#CPP/7zip/Compress/DllExports2Compress.cpp
#CPP/7zip/Compress/DllExportsCompress.cpp
CPP/7zip/Compress/ImplodeDecoder.cpp
CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp
CPP/7zip/Compress/LzfseDecoder.cpp
CPP/7zip/Compress/LzhDecoder.cpp
CPP/7zip/Compress/Lzma2Decoder.cpp
@ -57,10 +62,9 @@ target_sources(7zip PRIVATE
CPP/7zip/Compress/XpressDecoder.cpp
CPP/7zip/Compress/XzDecoder.cpp
CPP/7zip/Compress/XzEncoder.cpp
CPP/7zip/Compress/ZDecoder.cpp
CPP/7zip/Compress/ZlibDecoder.cpp
CPP/7zip/Compress/ZlibEncoder.cpp
CPP/7zip/Compress/ZDecoder.cpp
CPP/7zip/Compress/CodecExports.cpp
CPP/7zip/Crypto/7zAes.cpp
CPP/7zip/Crypto/7zAesRegister.cpp
@ -109,6 +113,7 @@ target_sources(7zip PRIVATE
C/Sha1.c
C/Sha256.c
C/Sort.c
C/SwapBytes.c
C/Threads.c
C/Xz.c
C/XzDec.c

4
ports/7zip/portfile.cmake
View File

@ -1,8 +1,8 @@
set(7ZIP_VERSION "2201")
set(7ZIP_VERSION "2301")
vcpkg_download_distfile(ARCHIVE
URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z"
FILENAME "7z${7ZIP_VERSION}-src.7z"
SHA512 c37cede4b7253b8dc4372e9e011ef0fee0c1cd53cf9705bf106672a455e7ce1e5a0a288c763d73d3c28b2a41fb860c9bacb702b01d9192eed810787c7da1e0d8
SHA512 45038fc49b0be8e7435939a79ad9f46f360b43b651148a8cde74fafdb8536f51a4be3b1ea91e06203267e5121267f6601f8ae6678feaf18e4b7a4f79a16730e7
)
vcpkg_extract_source_archive(

3
ports/7zip/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "7zip",
"version-string": "22.01",
"port-version": 1,
"version-string": "23.01",
"description": "Library for archiving file with a high compression ratio.",
"homepage": "https://www.7-zip.org",
"license": "LGPL-2.1-or-later",

10
scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
View File

@ -1,5 +1,7 @@
set(program_name 7z)
set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip")
set(download_urls "https://7-zip.org/a/7z1900.msi")
set(download_filename "7z1900.msi")
set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067)
set(tool_subdirectory "23.01")
set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path
list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip")
set(download_urls "https://7-zip.org/a/7z2301.msi")
set(download_filename "7z2301.msi")
set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596)

16
scripts/vcpkgTools.xml
View File

@ -131,18 +131,18 @@
<archiveName>installer-framework-opensource-src-4.4.0.zip</archiveName>
</tool>
<tool name="7zip_msi" os="windows">
<version>21.07</version>
<version>23.01</version>
<exeRelativePath>Files\7-Zip\7z.exe</exeRelativePath>
<url>https://www.7-zip.org/a/7z2107-x64.msi</url>
<sha512>d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d</sha512>
<archiveName>7z2107-x64.msi</archiveName>
<url>https://www.7-zip.org/a/7z2301-x64.msi</url>
<sha512>09e3ce970ea8383e8c736a51ebb61e3036e655c81d59bc64c5eecb041abdad2cbce2f400fcf4478e22f56fe40f8d912c639f550a5f990e24abfd4e86cdd3755c</sha512>
<archiveName>7z2301-x64.msi</archiveName>
</tool>
<tool name="7zip" os="windows">
<version>21.07</version>
<version>23.01</version>
<exeRelativePath>7za.exe</exeRelativePath>
<url>https://www.7-zip.org/a/7z2107-extra.7z</url>
<sha512>648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848</sha512>
<archiveName>7z2107-extra.7z</archiveName>
<url>https://www.7-zip.org/a/7z2301-extra.7z</url>
<sha512>c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b</sha512>
<archiveName>7z2301-extra.7z</archiveName>
</tool>
<tool name="aria2" os="windows">
<version>1.35.0</version>

5
versions/7-/7zip.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "770ce8dc829180bfcf2c396aa780474a87289f89",
"version-string": "23.01",
"port-version": 0
},
{
"git-tree": "b0a5040bfab9f50a386dc1b40f291fa581b21c79",
"version-string": "22.01",

4
versions/baseline.json
View File

@ -5,8 +5,8 @@
"port-version": 4
},
"7zip": {
"baseline": "22.01",
"port-version": 1
"baseline": "23.01",
"port-version": 0
},
"ableton": {
"baseline": "3.0.6",