From b9c520e405d72d06d767330c0634a51eabe2610cd97c98f6cece87f65df67026 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 31 May 2024 08:19:26 +0000 Subject: [PATCH] Accepting request 1176922 from home:AndreasStieger:branches:Archiving 7zip 24.05 OBS-URL: https://build.opensuse.org/request/show/1176922 OBS-URL: https://build.opensuse.org/package/show/Archiving/7zip?expand=0&rev=30 --- 7z2301-src.tar.xz | 3 --- 7z2405-src.tar.xz | 3 +++ 7zip.changes | 31 +++++++++++++++++++++++++++++++ 7zip.spec | 17 ++++++++--------- fix-avx-sle.patch | 24 ------------------------ 5 files changed, 42 insertions(+), 36 deletions(-) delete mode 100644 7z2301-src.tar.xz create mode 100644 7z2405-src.tar.xz delete mode 100644 fix-avx-sle.patch diff --git a/7z2301-src.tar.xz b/7z2301-src.tar.xz deleted file mode 100644 index 830cec8..0000000 --- a/7z2301-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74 -size 1378588 diff --git a/7z2405-src.tar.xz b/7z2405-src.tar.xz new file mode 100644 index 0000000..c61c4c0 --- /dev/null +++ b/7z2405-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63f341cf80b8d287c6e945519b3da0fa75553c85572a471b7fa6e68f9a90b790 +size 1486772 diff --git a/7zip.changes b/7zip.changes index 099011a..ad906a5 100644 --- a/7zip.changes +++ b/7zip.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun May 26 08:50:16 UTC 2024 - Andreas Stieger + +- update to 24.05: + * New switch -myv=.. to set decoder compatibility version for + 7z archive creating + * New switches -myfa and -myfd to allow or disallow the specified + filter method for 7z archive creating + * can use new RISCV filter for compression to 7z and xz archives + * can ask user permission to unpack RAR archives that require + large amount of memory + * new switch -smemx{size}g : to set allowed memory usage limit + for RAR archive unpacking. + * -y switch disables user requests and messages. + * -slmu switch : to show timestamps as UTC instead of LOCAL TIME + * support .sha256 files that use backslash path separator '\' + * can unpack ZSTD archives (.zst filename extension). + * can unpack ZIP, SquashFS and RPM archives that use ZSTD + compression method. + * support fast hash algorithm XXH64 that is used in ZSTD. + * can unpack RAR archives (that use larger than 4 GB dictionary) + created by new WinRAR 7.00. + * can unpack DMG archives that use XZ (ULMO/LZMA) compression method + * can unpack NTFS images with cluster size larger than 64 KB. + * can unpack MBR and GDP images with 4 KB sectors. + * Speed optimizations for archive unpacking: rar, cab, wim, zip, gz. + * Speed optimizations for hash caclulation: CRC-32, CRC-64, BLAKE2sp. + * Fix multivolume creation in some cases + * bug fixs +- drop fix-avx-sle.patch + ------------------------------------------------------------------- Wed Mar 6 12:46:58 UTC 2024 - Dominique Leuenberger diff --git a/7zip.spec b/7zip.spec index 529a01e..fbba33a 100644 --- a/7zip.spec +++ b/7zip.spec @@ -2,6 +2,7 @@ # spec file for package 7zip # # Copyright (c) 2024 SUSE LLC +# Copyright (c) 2024 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +17,9 @@ # -%define stripped_version 2301 +%define stripped_version 2405 Name: 7zip -Version: 23.01 +Version: 24.05 Release: 0 Summary: Command-line file archiver with high compression ratio # CPP/7zip/Compress/LzfseDecoder.cpp is under the BSD-3-Clause @@ -31,22 +32,18 @@ Source1: p7zip Source2: p7zip.1 Source3: 7zz.1 Patch0: fix-compatib-with-p7zip.patch -# PATCH-FIX-SUSE danilo.spinella@suse.com -# Fix build on SLE-15-SP6 -# https://sourceforge.net/p/sevenzip/patches/420/ -Patch1: fix-avx-sle.patch BuildRequires: dos2unix BuildRequires: gcc BuildRequires: gcc-c++ -%ifarch x86_64 %ix86 %x86_64 -BuildRequires: uasm -%endif Conflicts: p7zip Conflicts: p7zip-full Provides: p7zip = %{version} Provides: p7zip-full = %{version} Obsoletes: p7zip < %{version} Obsoletes: p7zip-full < %{version} +%ifarch x86_64 %ix86 %x86_64 +BuildRequires: uasm +%endif %description This package contains the 7z command line utility for archiving and @@ -121,6 +118,8 @@ ln -s %{_mandir}/man1/7zz.1 %{buildroot}%{_mandir}/man1/7z.1 ln -s %{_mandir}/man1/7z.1 %{buildroot}%{_mandir}/man1/7za.1 ln -s %{_mandir}/man1/7z.1 %{buildroot}%{_mandir}/man1/7zr.1 +%check + %files %license DOC/copying.txt DOC/License.txt %doc DOC/readme.txt DOC/7zC.txt DOC/Methods.txt DOC/src-history.txt diff --git a/fix-avx-sle.patch b/fix-avx-sle.patch deleted file mode 100644 index f70cf28..0000000 --- a/fix-avx-sle.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: 7zip/C/SwapBytes.c -=================================================================== ---- 7zip.orig/C/SwapBytes.c -+++ 7zip/C/SwapBytes.c -@@ -305,11 +305,14 @@ ShufBytes_256(void *items8, const void * - msvc 19.30+ (VS2022): replaces _mm256_set_m128i(m,m) to vbroadcastf128(m) as we want - */ - // _mm256_broadcastsi128_si256(*mask128_ptr); -- /* -- #define MY_mm256_set_m128i(hi, lo) _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 1) -- MY_mm256_set_m128i -- */ -- _mm256_set_m128i( -+ #if defined(Z7_GCC_VERSION) && (Z7_GCC_VERSION < 80000) -+ #warning "gcc < 8: using _mm256_set_m128i substitute" -+ #define MY_mm256_set_m128i(hi, lo) _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 1) -+ #else -+ #define MY_mm256_set_m128i _mm256_set_m128i -+ #endif -+ //_mm256_set_m128i( -+ MY_mm256_set_m128i( - *(const __m128i *)mask128_ptr, - *(const __m128i *)mask128_ptr); - #endif