summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2022-06-19 21:12:46 +0200
committerOleksandr Natalenko2022-06-19 21:12:46 +0200
commit2e068ed807e7c986b2e7dbb4a01ce158454a6295 (patch)
tree143ac212f4704b5d8687006e6d6f779dd4fcbe33
parent75f31a9da2725b484ab2244cc854a43e463df116 (diff)
downloadaur-2e068ed807e7c986b2e7dbb4a01ce158454a6295.tar.gz
update to v22.00
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--meson.build9
3 files changed, 13 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83c386861da8..f49972b5cbe0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = 7-zip
pkgdesc = File archiver with a high compression ratio
- pkgver = 21.07
- pkgrel = 6
+ pkgver = 22.00
+ pkgrel = 1
url = https://www.7-zip.org
arch = x86_64
license = LGPL
@@ -9,11 +9,11 @@ pkgbase = 7-zip
license = custom:unRAR
makedepends = uasm
makedepends = meson
- source = https://7-zip.org/a/7z2107-src.7z
+ source = https://7-zip.org/a/7z2200-src.tar.xz
source = 01-gcc-12.patch
source = meson.build
- sha256sums = d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c
+ sha256sums = 40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675
sha256sums = e4d34366e091b8404dd04f02bcad46518d2930ec0b4a420e1316db020234b085
- sha256sums = 642be36de3c1957d78b9e3ff24e511f8fe63b9b1ab3527efdb2adaacbeba702e
+ sha256sums = c88075d8eefec60166e1602e7356df477e946682c911ef4555b942505c245e5c
pkgname = 7-zip
diff --git a/PKGBUILD b/PKGBUILD
index ef9a234cc0da..8e1b67922c10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
# Maintainer: Oleksandr Natalenko <oleksandr@natalenko.name>
pkgname=7-zip
-pkgver=21.07
-pkgrel=6
+pkgver=22.00
+pkgrel=1
pkgdesc="File archiver with a high compression ratio"
url="https://www.7-zip.org"
license=('LGPL' 'BSD' 'custom:unRAR')
arch=(x86_64)
makedepends=(uasm meson)
-source=(https://7-zip.org/a/7z2107-src.7z
+source=(https://7-zip.org/a/7z2200-src.tar.xz
01-gcc-12.patch
meson.build)
-sha256sums=('d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c'
+sha256sums=('40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675'
'e4d34366e091b8404dd04f02bcad46518d2930ec0b4a420e1316db020234b085'
- '642be36de3c1957d78b9e3ff24e511f8fe63b9b1ab3527efdb2adaacbeba702e')
+ 'c88075d8eefec60166e1602e7356df477e946682c911ef4555b942505c245e5c')
prepare() {
patch -Np1 -i 01-gcc-12.patch
diff --git a/meson.build b/meson.build
index 750e536e75d8..0327d32e60b0 100644
--- a/meson.build
+++ b/meson.build
@@ -95,6 +95,7 @@ cpp_files = [
'CPP/7zip/Archive/7z/7zRegister.cpp',
'CPP/7zip/Archive/7z/7zSpecStream.cpp',
'CPP/7zip/Archive/7z/7zUpdate.cpp',
+ 'CPP/7zip/Archive/ApfsHandler.cpp',
'CPP/7zip/Archive/ApmHandler.cpp',
'CPP/7zip/Archive/ArHandler.cpp',
'CPP/7zip/Archive/ArjHandler.cpp',
@@ -135,6 +136,7 @@ cpp_files = [
'CPP/7zip/Archive/Iso/IsoHeader.cpp',
'CPP/7zip/Archive/Iso/IsoIn.cpp',
'CPP/7zip/Archive/Iso/IsoRegister.cpp',
+ 'CPP/7zip/Archive/LpHandler.cpp',
'CPP/7zip/Archive/LzhHandler.cpp',
'CPP/7zip/Archive/LzmaHandler.cpp',
'CPP/7zip/Archive/MachoHandler.cpp',
@@ -152,6 +154,7 @@ cpp_files = [
'CPP/7zip/Archive/Rar/Rar5Handler.cpp',
'CPP/7zip/Archive/Rar/RarHandler.cpp',
'CPP/7zip/Archive/RpmHandler.cpp',
+ 'CPP/7zip/Archive/SparseHandler.cpp',
'CPP/7zip/Archive/SplitHandler.cpp',
'CPP/7zip/Archive/SquashfsHandler.cpp',
'CPP/7zip/Archive/SwfHandler.cpp',
@@ -392,10 +395,6 @@ add_project_arguments(
],
)
-extra_args = [
- '-Wp,-U_FORTIFY_SOURCE',
-]
-
project_target = executable('7zz',
[
uasm_files,
@@ -405,8 +404,6 @@ project_target = executable('7zz',
dependencies: project_dependencies,
install: true,
link_args: '-Wl,-z,noexecstack',
- c_args: extra_args,
- cpp_args: extra_args,
)
install_data(