New version (24.05)

+ Use GitHub generated tarball.
+ Slight rework.

4 files changed, 35 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 378dc6c3673f..26b8d403da61 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 = 23.01
-	pkgrel = 5
+	pkgver = 24.05
+	pkgrel = 1
 	url = https://7-zip.org/
 	arch = x86_64
 	arch = i686
@@ -10,21 +10,20 @@ pkgbase = 7-zip-full
 	license = LGPL-2.1-or-later
 	license = BSD-3-Clause
 	license = LicenseRef-UnRAR
-	makedepends = git
 	makedepends = uasm
 	provides = 7-zip
 	provides = p7zip
 	provides = 7z.so
 	conflicts = 7-zip
 	conflicts = p7zip
-	noextract = 7z2301-linux-x64.tar.xz
-	source = git+https://github.com/ip7z/7zip.git#tag=23.01
-	source = https://github.com/ip7z/7zip/releases/download/23.01/7z2301-linux-x64.tar.xz
+	noextract = 7z2405-linux-x64.tar.xz
+	source = https://github.com/ip7z/7zip/archive/24.05/7zip-24.05.tar.gz
+	source = https://github.com/ip7z/7zip/releases/download/24.05/7z2405-linux-x64.tar.xz
 	source = 01-make.patch
 	source = 02-lib-load-path.patch
-	sha256sums = 438b2500d17cbb84f532666d17a3d48775653f914ffa1365ec18a28f4eec1745
-	sha256sums = 23babcab045b78016e443f862363e4ab63c77d75bc715c0b3463f6134cbcf318
-	sha256sums = 59dee0da982a8da84af8f7b7a08868d4e8ccffd02be82b97834dd4024ddbd38b
-	sha256sums = ac846e73d248cc51e3005d62d68f77a97c13d6baaae5c159e9fd35919921558d
+	sha256sums = 182d6e12ff8af0beafe46c9cd8e82b4271efb61c334c1068f8772777b535a03c
+	sha256sums = 7294f7478d90d2dc122137ff64607d354c66bd45b10911359658b85ca8892118
+	sha256sums = f54dfe73ad045f200d5512dfd4387ef626068662a5af6e17d81052996544af54
+	sha256sums = 338b732445d3cfa416e40384bd9f0596506aa4b464b3f86aa971af4cfa6084c7
 
 pkgname = 7-zip-full
diff --git a/01-make.patch b/01-make.patch
index 718625ebe6bf..07e28535df2a 100644
--- a/01-make.patch
+++ b/01-make.patch
@@ -3,12 +3,12 @@
 @@ -10 +10 @@
 -MY_ASM = asmc
 +MY_ASM = uasm
-@@ -99 +99 @@
--
-+LDFLAGS += $(LDFLAGS_ADD)
-@@ -152 +152 @@
+@@ -172 +172 @@
 -CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
-+CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) $(CFLAGS_ADD) -o $@
-@@ -193 +193 @@
--CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
-+CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXXFLAGS_ADD) -o $@
++CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) $(CFLAGS_USER) -o $@
+@@ -213 +213 @@
+-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) -o $@
++CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) $(CXXFLAGS_USER) -o $@
+@@ -251 +251 @@
+-LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(LFLAGS_NOEXECSTACK) $(OBJS) $(MY_LIBS) $(LIB2)
++LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(LFLAGS_NOEXECSTACK) $(LDFLAGS_USER) $(OBJS) $(MY_LIBS) $(LIB2)
diff --git a/02-lib-load-path.patch b/02-lib-load-path.patch
index d4e73f55b3da..93dc582736f9 100644
--- a/02-lib-load-path.patch
+++ b/02-lib-load-path.patch
@@ -1,5 +1,5 @@
 --- a/CPP/7zip/UI/Common/LoadCodecs.cpp
 +++ b/CPP/7zip/UI/Common/LoadCodecs.cpp
-@@ -830 +830 @@
+@@ -834 +834 @@
 -    const FString baseFolder = GetBaseFolderPrefixFromRegistry();
 +    const FString baseFolder = FString("/usr/lib/");
diff --git a/PKGBUILD b/PKGBUILD
index a58ed3ba00fe..0b54364a75fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,45 @@
 _name=7-zip
 pkgname=${_name}-full
-pkgver=23.01
-pkgrel=5
+pkgver=24.05
+pkgrel=1
 pkgdesc='File archiver with a high compression ratio (full package to replace p7zip)'
 url='https://7-zip.org/'
 license=('LGPL-2.1-or-later' 'BSD-3-Clause' 'LicenseRef-UnRAR')
 arch=('x86_64' 'i686' 'aarch64' 'armv7h')
 provides=("${_name}" 'p7zip' '7z.so')
 conflicts=("${_name}" 'p7zip')
-makedepends=('git' 'uasm')
+makedepends=('uasm')
 
 _repo='7zip'
+_snapshot="${_repo}-${pkgver}"
 _url="https://github.com/ip7z/${_repo}"
 _manarc="7z${pkgver//./}-linux-x64.tar.xz"
 
 source=(
-    "git+${_url}.git#tag=${pkgver}"
+    "${_url}/archive/${pkgver}/${_snapshot}.tar.gz"
     "${_url}/releases/download/${pkgver}/${_manarc}" # to get the manual
     '01-make.patch'
     '02-lib-load-path.patch'
 )
 
 sha256sums=(
-    '438b2500d17cbb84f532666d17a3d48775653f914ffa1365ec18a28f4eec1745'
-    '23babcab045b78016e443f862363e4ab63c77d75bc715c0b3463f6134cbcf318'
-    '59dee0da982a8da84af8f7b7a08868d4e8ccffd02be82b97834dd4024ddbd38b'
-    'ac846e73d248cc51e3005d62d68f77a97c13d6baaae5c159e9fd35919921558d'
+    '182d6e12ff8af0beafe46c9cd8e82b4271efb61c334c1068f8772777b535a03c'
+    '7294f7478d90d2dc122137ff64607d354c66bd45b10911359658b85ca8892118'
+    'f54dfe73ad045f200d5512dfd4387ef626068662a5af6e17d81052996544af54'
+    '338b732445d3cfa416e40384bd9f0596506aa4b464b3f86aa971af4cfa6084c7'
 )
 
 noextract=("${_manarc}")
 
 prepare() {
     for p in *.patch; do
-        patch -p1 -d "${_repo}" < "${p}"
+        patch -p1 -d "${_snapshot}" < "${p}"
     done
 }
 
 _make() {
     echo "Building '${1}'..."
-    cd "${1}"
+    cd "${_snapshot}/${1}"
     mkdir -p '_o'
     make -sf 'makefile.gcc'
 }
@@ -53,24 +54,22 @@ _build() {
     [ "${CARCH}" = 'aarch64' ] && IS_ARM64=1
     USE_ASM=1
     CFLAGS_WARN='-Wno-error'
-    CFLAGS_ADD="${CFLAGS}"
-    LDFLAGS_ADD="${LDFLAGS}"
-    CXXFLAGS_ADD="${CXXFLAGS}"
+    CFLAGS_USER="${CFLAGS}"
+    CXXFLAGS_USER="${CXXFLAGS}"
+    LDFLAGS_USER="${LDFLAGS}"
     set +a
 
-    cd "${_repo}"
-    local targets=('CPP/7zip/'{'UI/Console','Bundles/'{'Alone','Alone7z','Format7zF'}})
-    for target in "${targets[@]}"; do
+    for target in "$@"; do
         (_make "${target}")
     done
 }
 
 build() {
-    (_build)
+    (_build 'CPP/7zip/'{'UI/Console','Bundles/'{'Alone','Alone7z','Format7zF'}})
 }
 
 package() {
-    cd "${_repo}"
+    cd "${_snapshot}"
 
     install -Dm755 -t "${pkgdir}/usr/bin" \
         'CPP/7zip/'{'UI/Console/_o/7z','Bundles/'{'Alone/_o/7za','Alone7z/_o/7zr'}}