From 49d3b393d9aa85dfb3f95a289fcec5d9f9480145 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 6 Dec 2024 09:05:06 +0900 Subject: [PATCH] Update 7-Zip to 24.09 --- ArchiveSupport/Merge7z/BuildArc.cmd | 2 +- DownloadDeps.cmd | 8 ++++---- Externals/sevenzip | 2 +- Externals/versions.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd index ab4cff69cd6..5bd0c569f88 100644 --- a/ArchiveSupport/Merge7z/BuildArc.cmd +++ b/ArchiveSupport/Merge7z/BuildArc.cmd @@ -1,7 +1,7 @@ pushd "%~dp0" setlocal -set MERGE7z_VERSION=2408.0 +set MERGE7z_VERSION=2409.0 set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH% set DISTDIR=..\..\Build\Releases diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 6f61f46f9a8..d674cff7bee 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -12,10 +12,10 @@ set downloadsdir=%~dp0\build\WinMergeDownloadDeps set urls_destdirs=^ https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^ https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.18.7.0/ShellExtension-1.18.7.0.zip!Build ^ -https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-x86.zip!Build\x86\Release ^ -https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-x64.zip!Build\X64\Release ^ -https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-ARM.zip!Build\ARM64\Release ^ -https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-ARM64.zip!Build\ARM64\Release ^ +https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-x86.zip!Build\x86\Release ^ +https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-x64.zip!Build\X64\Release ^ +https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-ARM.zip!Build\ARM64\Release ^ +https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-ARM64.zip!Build\ARM64\Release ^ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-x86.zip!Build\x86\Release ^ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-x64.zip!Build\x64\Release ^ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-ARM.zip!Build\ARM\Release ^ diff --git a/Externals/sevenzip b/Externals/sevenzip index d10e665a615..932272eb292 160000 --- a/Externals/sevenzip +++ b/Externals/sevenzip @@ -1 +1 @@ -Subproject commit d10e665a615f69343a492e92ddf1989917880aaf +Subproject commit 932272eb2922fd342c8ea52fa31fa28ce49eb2f9 diff --git a/Externals/versions.txt b/Externals/versions.txt index a0985e138b7..65994f5afe4 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -15,7 +15,7 @@ This file lists versions of the external components we are using. - rapidjson: 1.1.1 - Google C++ Testing Framework: 1.14.0 - GNU patch: 2.7.6-1 -- 7-zip: 24.08 +- 7-zip: 24.09 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff) - html-tidy5: 5.4.0 - jq: 1.7.1