7-zip 24.05 (#107)

add badge with versions in README.md
hemnstill · May 15, 2024 · f605285 · f605285
1 parent 4eb6180
commit f605285
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/7-Zip.yml b/.github/workflows/7-Zip.yml
@@ -57,7 +57,7 @@ jobs:
     uses: ./.github/workflows/release.yml
     with:
       workflow: ${{ github.workflow }}
-      tool_version: '23.01'
+      tool_version: '24.05'
       prepare_body: |
         bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md
         bsdtar -Oxf ./build-mingw/build-mingw.tar.gz build-mingw.md >> body.md

diff --git a/7-Zip/build_mingw.sh b/7-Zip/build_mingw.sh
@@ -3,13 +3,13 @@ dp0="$(realpath "$(dirname "$0")")"
 set -e
 
 tool_name="7-Zip"
-tool_version="23.01"
+tool_version="24.05"
 self_toolset_name="build-mingw"
 release_version_dirpath="$dp0/release/build"
 
 mkdir -p "$release_version_dirpath" && cd "$dp0/release"
 
-download_url="https://www.7-zip.org/a/7z2301-src.tar.xz"
+download_url="https://www.7-zip.org/a/7z2405-src.tar.xz"
 echo "::group::prepare sources $download_url"
 
 "$dp0/../.tools/download_bsdtar.sh"

diff --git a/7-Zip/build_musl.sh b/7-Zip/build_musl.sh
@@ -10,13 +10,13 @@ apk add --no-cache alpine-sdk make linux-headers
 echo "::endgroup::"
 
 tool_name="7-Zip"
-tool_version="23.01"
+tool_version="24.05"
 self_toolset_name="build-musl"
 release_version_dirpath="$dp0/release/build"
 
 mkdir -p "$release_version_dirpath" && cd "$dp0/release"
 
-download_url="https://www.7-zip.org/a/7z2301-src.tar.xz"
+download_url="https://www.7-zip.org/a/7z2405-src.tar.xz"
 echo "::group::prepare sources $download_url"
 
 "$dp0/../.tools/download_bsdtar.sh"

diff --git a/7-Zip/release/0001-static.patch b/7-Zip/release/0001-static.patch
@@ -1,38 +1,25 @@
-From 1d9a48d5589fd888d63f363ed654f81c1693bec7 Mon Sep 17 00:00:00 2001
+From 83965d8dd1e6e802c46febc204cddd32fbecea8a Mon Sep 17 00:00:00 2001
 From: Reshetnikov Alexandr <hemn.still@gmail.com>
-Date: Sun, 6 Aug 2023 22:01:23 +0400
-Subject: [PATCH] + static - affinity
+Date: Wed, 15 May 2024 20:56:13 +0400
+Subject: [PATCH] LDFLAGS_STATIC2 = -static
 
 ---
- C/Threads.h           | 1 -
  CPP/7zip/7zip_gcc.mak | 2 ++
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+)
 
-diff --git a/C/Threads.h b/C/Threads.h
-index c6aa6a8..7abb2ab 100644
---- a/C/Threads.h
-+++ b/C/Threads.h
-@@ -12,7 +12,6 @@
- #if defined(__linux__)
- #if !defined(__APPLE__) && !defined(_AIX) && !defined(__ANDROID__)
- #ifndef Z7_AFFINITY_DISABLE
--#define Z7_AFFINITY_SUPPORTED
- // #pragma message(" ==== Z7_AFFINITY_SUPPORTED")
- // #define _GNU_SOURCE
- #endif
 diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
-index a8eb6e3..bf3e671 100644
+index b3f94be..d3b5066 100644
 --- a/CPP/7zip/7zip_gcc.mak
 +++ b/CPP/7zip/7zip_gcc.mak
-@@ -68,6 +68,8 @@ endif
+@@ -85,6 +85,8 @@ endif
  endif
  endif
 
 +LDFLAGS_STATIC_2 = -static
 +
- LDFLAGS_STATIC = -DNDEBUG $(LDFLAGS_STATIC_2)
+ LDFLAGS_STATIC = $(CFLAGS_DEBUG) $(LDFLAGS_STATIC_2) $(LDFLAGS_STATIC_3)
 
  ifndef O
 -- 
-2.37.2.windows.2
+2.43.0.windows.1
 
diff --git a/7-Zip/test_linux.sh b/7-Zip/test_linux.sh
@@ -2,7 +2,7 @@
 
 testVersion() {
   assertEquals "
-7-Zip (z) 23.01 (x64) : Copyright (c) 1999-2023 Igor Pavlov : 2023-06-20" "$(../bin/7zz | head -2)"
+7-Zip (z) 24.05 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-05-14" "$(../bin/7zz | head -2)"
 }
 
 # Load and run shUnit2.

diff --git a/7-Zip/test_windows.sh b/7-Zip/test_windows.sh
@@ -2,7 +2,7 @@
 
 testVersion() {
   assertEquals "
-7-Zip (z) 23.01 (x64) : Copyright (c) 1999-2023 Igor Pavlov : 2023-06-20" "$(../bin/7zz.exe | dos2unix | head -2)"
+7-Zip (z) 24.05 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-05-14" "$(../bin/7zz.exe | dos2unix | head -2)"
 }
 
 # Load and run shUnit2.

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mypy-1.8.0/total?label=⭳%20mypy-1.8.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mypy-1.8.0)                                        | [![GitHub Repo stars](https://img.shields.io/github/stars/python/mypy?style=social&label=mypy)](https://github.com/python/mypy) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/python/mypy)](https://mypy.readthedocs.io/en/latest/)                                                                                                                                                                                                                                                                                                                                                                   |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/ansible-8.3.0/total?label=⭳%20ansible-8.3.0-core-2.15.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/ansible-8.3.0)                   | [![GitHub Repo stars](https://img.shields.io/github/stars/ansible/ansible?style=social&label=ansible)](https://github.com/ansible/ansible) [![PyPI](https://img.shields.io/pypi/v/ansible)](https://pypi.org/project/ansible/) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/ansible/ansible)](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html)                                                                                                                                                                                                              |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/bsdtar-3.7.3/total?label=⭳%20bsdtar-3.7.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.7.3)                                  | [![GitHub Repo stars](https://img.shields.io/github/stars/libarchive/libarchive?style=social&label=libarchive)](https://github.com/libarchive/libarchive) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/libarchive/libarchive)](https://github.com/libarchive/libarchive/releases/latest)                                                                                                                                                                                                                                                                             |
-| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/7-Zip-23.01/total?label=⭳%207-Zip-23.01)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-23.01)                                     | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip)](https://sourceforge.net/projects/sevenzip/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/7-Zip-24.05/total?label=⭳%207-Zip-24.05)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-24.05)                                     | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip&logo=sourceforge)](https://sourceforge.net/projects/sevenzip/) [![versions](https://repology.org/badge/latest-versions/7zip.svg)](https://repology.org/project/7zip/versions)                                                                                                                                                                                                                                                                                                                                            |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/zstd-1.5.6/total?label=⭳%20zstd-1.5.6)](https://github.com/hemnstill/StandaloneTools/releases/tag/zstd-1.5.6)                                        | [![GitHub Repo stars](https://img.shields.io/github/stars/facebook/zstd?style=social&label=zstd)](https://github.com/facebook/zstd) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/facebook/zstd)](https://github.com/facebook/zstd/releases/latest)                                                                                                                                                                                                                                                                                                                   |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pg_dump-15.1/total?label=⭳%20pg_dump-15.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/pg_dump-15.1)                                  | [![GitHub Repo stars](https://img.shields.io/github/stars/postgres/postgres?style=social&label=postgres)](https://github.com/postgres/postgres) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/postgres/postgres)](https://www.postgresql.org/docs/current/index.html)                                                                                                                                                                                                                                                                                                                                 |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mysql-8.3.0/total?label=⭳%20mysql-8.3.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.3.0)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/mysql/mysql-server?style=social&label=mysql-server)](https://github.com/mysql/mysql-server) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/mysql/mysql-server)](https://dev.mysql.com/doc/relnotes/mysql/en/)                                                                                                                                                                                                                                                                                                                                |