pool/7zip
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1094580 from home:favogt:branches:Archiving

Browse Source 
- Update to version 23.01
- Refresh fix-compatib-with-p7zip.patch

OBS-URL: https://build.opensuse.org/request/show/1094580
OBS-URL: https://build.opensuse.org/package/show/Archiving/7zip?expand=0&rev=19
This commit is contained in:
Danilo Spinella
2023-06-22 11:28:55 +00:00
committed by Git OBS Bridge
parent 8b470322dd
commit 68eea4e192
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
7z2201-src.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5
size 1291560

BIN
7z2301-src.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
7zip.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 21 10:15:05 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Update to version 23.01
- Refresh fix-compatib-with-p7zip.patch
-------------------------------------------------------------------
Mon Dec 12 21:18:30 UTC 2022 - Dirk Müller <dmueller@suse.com>

8
7zip.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package 7zip
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
#
%define stripped_version 2201
%define stripped_version 2301
Name: 7zip
Version: 22.01
Version: 23.01
Release: 0
Summary: File Archivier
# CPP/7zip/Compress/LzfseDecoder.cpp is under the BSD-3-Clause
@@ -58,7 +58,7 @@ chmod -x DOC/*.txt
sed -i 's/-Werror//' CPP/7zip/7zip_gcc.mak
%if 0%{?suse_version} < 1550
# (gcc 7.x) Remove -Waddress-of-packed-member to make build succeed
sed -i -e 's/-Waddress-of-packed-member//' -e 's/-Wcast-align=strict//' C/warn_gcc.mak CPP/7zip/warn_gcc.mak
sed -i -e 's/-Waddress-of-packed-member//' -e 's/-Wcast-align=strict//' -e 's/-Wmissing-attributes//' C/warn_gcc.mak CPP/7zip/warn_gcc.mak
%endif
# Inject CFLAGS
sed -i 's/^ -fPIC/ -fPIC %{optflags}/' CPP/7zip/7zip_gcc.mak

11
fix-compatib-with-p7zip.patch
View File

@@ -26,14 +26,15 @@ Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
OpenCallbackConsole.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -Nru 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp 7zip_2/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
--- 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp 2017-02-18 00:42:14.000000000 +0100
+++ 7zip_2/CPP/7zip/UI/Console/OpenCallbackConsole.cpp 2022-01-26 08:40:15.616512459 +0100
@@ -87,7 +87,7 @@
Index: 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
===================================================================
--- 7zip.orig/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
+++ 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
@@ -87,7 +87,7 @@ HRESULT COpenCallbackConsole::Open_Crypt
if (!PasswordIsDefined)
{
ClosePercents();
- RINOK(GetPassword_HRESULT(_so, Password));
- RINOK(GetPassword_HRESULT(_so, Password))
+ GetPassword_HRESULT(_so, Password);
PasswordIsDefined = true;
}