Fix for gcc12

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0501ee68d62..2d6c6b1d11f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 7-zip-full
 	pkgdesc = File archiver with a high compression ratio. (Full package to replace p7zip.)
 	pkgver = 21.07
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.7-zip.org
 	arch = x86_64
 	license = LGPL
@@ -13,6 +13,6 @@ pkgbase = 7-zip-full
 	source = 7z2107-src.tar.xz::https://www.7-zip.org/a/7z2107-src.tar.xz
 	source = prepare.patch
 	sha256sums = 213d594407cb8efcba36610b152ca4921eda14163310b43903d13e68313e1e39
-	sha256sums = aa93c9919fe87a51c94453888581f3ba936c3a85fb297d053270b5f6edd578d3
+	sha256sums = 002a663deebc09ada0d7c7372b441c2ed1f017e4866c1602a4409f06c8aab071
 
 pkgname = 7-zip-full
diff --git a/PKGBUILD b/PKGBUILD
index ca1764ba5781..24ab4141ea31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=7-zip-full
 pkgver=21.07
-pkgrel=3
+pkgrel=4
 pkgdesc="File archiver with a high compression ratio. (Full package to replace p7zip.)"
 url="https://www.7-zip.org"
 license=(LGPL)
@@ -18,7 +18,7 @@ source=(
 
 sha256sums=(
     '213d594407cb8efcba36610b152ca4921eda14163310b43903d13e68313e1e39'
-    'aa93c9919fe87a51c94453888581f3ba936c3a85fb297d053270b5f6edd578d3'
+    '002a663deebc09ada0d7c7372b441c2ed1f017e4866c1602a4409f06c8aab071'
 )
 
 prepare() {
diff --git a/prepare.patch b/prepare.patch
index 3dbb6a36c0b0..42bf7c1bfbef 100644
--- a/prepare.patch
+++ b/prepare.patch
@@ -12,3 +12,21 @@
 @@ -2 +2 @@

 -O=b/g_$(PLATFORM)

 +O=$(BUILD_DIR)

+

+--- C/LzmaEnc.c

++++ C/LzmaEnc.c

+@@ -2993,12 +2993,13 @@

+ 

+   nowPos64 = p->nowPos64;

+   RangeEnc_Init(&p->rc);

+-  p->rc.outStream = &outStream.vt;

+ 

+   if (desiredPackSize == 0)

+     return SZ_ERROR_OUTPUT_EOF;

+ 

++  p->rc.outStream = &outStream.vt;

+   res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);

++  p->rc.outStream = NULL;

+   

+   *unpackSize = (UInt32)(p->nowPos64 - nowPos64);

+   *destLen -= outStream.rem;