summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
-rw-r--r--prepare.patch3
3 files changed, 14 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d6c6b1d11f7..4c6637ffbefb 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 = 4
+ pkgver = 22.00
+ pkgrel = 1
url = https://www.7-zip.org
arch = x86_64
license = LGPL
@@ -10,9 +10,9 @@ pkgbase = 7-zip-full
provides = p7zip
conflicts = 7-zip
conflicts = p7zip
- source = 7z2107-src.tar.xz::https://www.7-zip.org/a/7z2107-src.tar.xz
+ source = 7z2200-src.tar.xz::https://www.7-zip.org/a/7z2200-src.tar.xz
source = prepare.patch
- sha256sums = 213d594407cb8efcba36610b152ca4921eda14163310b43903d13e68313e1e39
- sha256sums = 002a663deebc09ada0d7c7372b441c2ed1f017e4866c1602a4409f06c8aab071
+ sha256sums = 40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675
+ sha256sums = 07abcf21a0aa67a6c9e78f553805a7a1f4b772b184b51c8e5c12c013cc692e2a
pkgname = 7-zip-full
diff --git a/PKGBUILD b/PKGBUILD
index 24ab4141ea31..4490416d4670 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
pkgname=7-zip-full
-pkgver=21.07
-pkgrel=4
+pkgver=22.00
+pkgrel=1
pkgdesc="File archiver with a high compression ratio. (Full package to replace p7zip.)"
url="https://www.7-zip.org"
license=(LGPL)
arch=(x86_64)
makedepends=('uasm')
-provides=('7-zip' 'p7zip')
+provides=("${pkgname%-full}" 'p7zip')
conflicts=("${provides[@]}")
-_archive='7z2107-src.tar.xz'
+_archive="7z${pkgver//./}-src.tar.xz"
source=(
"${_archive}::${url}/a/${_archive}"
@@ -17,8 +17,8 @@ source=(
)
sha256sums=(
- '213d594407cb8efcba36610b152ca4921eda14163310b43903d13e68313e1e39'
- '002a663deebc09ada0d7c7372b441c2ed1f017e4866c1602a4409f06c8aab071'
+ '40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675'
+ '07abcf21a0aa67a6c9e78f553805a7a1f4b772b184b51c8e5c12c013cc692e2a'
)
prepare() {
diff --git a/prepare.patch b/prepare.patch
index 42bf7c1bfbef..99fc98c3c9cd 100644
--- a/prepare.patch
+++ b/prepare.patch
@@ -3,6 +3,9 @@
@@ -10 +10 @@
-MY_ASM = asmc
+MY_ASM = uasm
+@@ -29 +29 @@
+- -fPIC
++ -fPIC -Wno-maybe-uninitialized
@@ -170 +170 @@
-LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
+LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -Wl,-z,noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)