summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--prepare.patch18
3 files changed, 7 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c6637ffbefb..2e2f4eb733ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = 7-zip-full
pkgdesc = File archiver with a high compression ratio. (Full package to replace p7zip.)
- pkgver = 22.00
+ pkgver = 22.01
pkgrel = 1
url = https://www.7-zip.org
arch = x86_64
@@ -10,9 +10,9 @@ pkgbase = 7-zip-full
provides = p7zip
conflicts = 7-zip
conflicts = p7zip
- source = 7z2200-src.tar.xz::https://www.7-zip.org/a/7z2200-src.tar.xz
+ source = 7z2201-src.tar.xz::https://www.7-zip.org/a/7z2201-src.tar.xz
source = prepare.patch
- sha256sums = 40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675
- sha256sums = 07abcf21a0aa67a6c9e78f553805a7a1f4b772b184b51c8e5c12c013cc692e2a
+ sha256sums = 393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5
+ sha256sums = 9682e6493d372424be837f2385820935a104b7ce60c3dc8946fdaaefd00ac21f
pkgname = 7-zip-full
diff --git a/PKGBUILD b/PKGBUILD
index 4490416d4670..f458666b8525 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=7-zip-full
-pkgver=22.00
+pkgver=22.01
pkgrel=1
pkgdesc="File archiver with a high compression ratio. (Full package to replace p7zip.)"
url="https://www.7-zip.org"
@@ -17,8 +17,8 @@ source=(
)
sha256sums=(
- '40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675'
- '07abcf21a0aa67a6c9e78f553805a7a1f4b772b184b51c8e5c12c013cc692e2a'
+ '393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5'
+ '9682e6493d372424be837f2385820935a104b7ce60c3dc8946fdaaefd00ac21f'
)
prepare() {
diff --git a/prepare.patch b/prepare.patch
index 99fc98c3c9cd..20e9fd9f1f9a 100644
--- a/prepare.patch
+++ b/prepare.patch
@@ -15,21 +15,3 @@
@@ -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;