7zip: update to 24.05

mingw-w64-7zip/001-disable-static.patch

@@ -0,0 +1,11 @@
+--- a/CPP/7zip/7zip_gcc.mak
++++ b/CPP/7zip/7zip_gcc.mak
+@@ -70,7 +70,7 @@
+ endif
+ 
+ ifdef IS_MINGW
+-LDFLAGS_STATIC_2 = -static
++LDFLAGS_STATIC_2 =
+ else
+ ifndef DEF_FILE
+ ifndef IS_NOT_STANDALONE

mingw-w64-7zip/PKGBUILD

@@ -3,36 +3,37 @@
 _realname=7zip
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=23.01
+pkgver=24.05
 pkgrel=1
 pkgdesc="A file archiver with a high compression ratio (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://7-zip.org"
 msys2_references=(
   'aur: 7-zip'
   "cpe: cpe:/a:7-zip:7-zip"
 )
-url="https://7-zip.org"
 license=('spdx:LGPL-2.1-or-later AND BSD-3-Clause')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 source=("$url/a/7z${pkgver//./}-src.tar.xz"
-        "clang-arm-target-fixes.patch")
-sha256sums=('356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74'
-            'def6c805a6e0682c60a68d636d49cd996fd991dd32911bcc0262bc840691ef43')
+        001-disable-static.patch)
+sha256sums=('63f341cf80b8d287c6e945519b3da0fa75553c85572a471b7fa6e68f9a90b790'
+            '80678c664cefb38e6402c83fc0878911c142e471ce42665291bb313d8c8e5185')
 
 prepare () {
-  case ${MSYSTEM} in
-    CLANG*)
-      sed -i 's/-Werror/ -Wno-missing-exception-spec -Wno-unused-but-set-variable -Wno-unknown-attributes/' */*.mak */*/*.mak
-      # This patch can be dropped once we're using Clang 16 or later
-      patch -p0 -i "${srcdir}/clang-arm-target-fixes.patch"
-      ;;
-  esac
+  if [[ ${CC} == clang ]] ; then
+    sed -i 's/-Werror/ -Wno-missing-exception-spec -Wno-unused-but-set-variable -Wno-unknown-attributes/' */*.mak */*/*.mak
+  fi
+  patch -p1 -i ${srcdir}/001-disable-static.patch
 }
 
 build() {
-  cd "${srcdir}"/
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cp -r CPP build-${MSYSTEM}/CPP
+  cp -r C build-${MSYSTEM}/C
+  cd build-${MSYSTEM}
 
   make -C CPP/7zip/Bundles/Format7zF -f makefile.gcc
   make -C CPP/7zip/UI/Console -f makefile.gcc
@@ -40,12 +41,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"
+  cd "${srcdir}"/build-${MSYSTEM}
 
   install -D -m755 $(find CPP/7zip/Bundles/ -name \*.dll) -t "${pkgdir}"${MINGW_PREFIX}/bin/
   install -D -m755 CPP/7zip/UI/Console/_o/7z.exe "${pkgdir}"${MINGW_PREFIX}/bin/7z.exe
   install -D -m755 CPP/7zip/Bundles/SFXCon/_o/7zCon.exe "${pkgdir}"${MINGW_PREFIX}/lib/7zip/7zCon.sfx
 
   install -d "${pkgdir}"${MINGW_PREFIX}/share/doc/7zip
-  install -D -m644 DOC/* "${pkgdir}"${MINGW_PREFIX}/share/doc/7zip
+  install -D -m644 "${srcdir}"/DOC/* "${pkgdir}"${MINGW_PREFIX}/share/doc/7zip
 }

mingw-w64-7zip/clang-arm-target-fixes.patch

@@ -1,70 +0,0 @@
-diff --git C/AesOpt.c C/AesOpt.c
-index af911e2..99800ea 100755
---- C/AesOpt.c
-+++ C/AesOpt.c
-@@ -576,7 +576,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
- 
- #if defined(__clang__) || defined(__GNUC__)
-   #ifdef MY_CPU_ARM64
--    #define ATTRIB_AES __attribute__((__target__("+crypto")))
-+    #define ATTRIB_AES __attribute__((__target__("crypto")))
-   #else
-     #define ATTRIB_AES __attribute__((__target__("fpu=crypto-neon-fp-armv8")))
-   #endif
-@@ -593,6 +593,9 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
- #if defined(_MSC_VER) && defined(MY_CPU_ARM64)
- #include <arm64_neon.h>
- #else
-+#define __ARM_FEATURE_AES
-+#define __ARM_FEATURE_SHA2
-+#define __ARM_FEATURE_CRYPTO
- #include <arm_neon.h>
- #endif
- 
-diff --git C/Sha1Opt.c C/Sha1Opt.c
-index b47a73a..bb4dd4c 100755
---- C/Sha1Opt.c
-+++ C/Sha1Opt.c
-@@ -224,7 +224,7 @@ void Z7_FASTCALL Sha1_UpdateBlocks_HW(UInt32 state[5], const Byte *data, size_t
- 
- #if defined(__clang__) || defined(__GNUC__)
-   #ifdef MY_CPU_ARM64
--    #define ATTRIB_SHA __attribute__((__target__("+crypto")))
-+    #define ATTRIB_SHA __attribute__((__target__("crypto")))
-   #else
-     #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8")))
-   #endif
-@@ -237,6 +237,9 @@ void Z7_FASTCALL Sha1_UpdateBlocks_HW(UInt32 state[5], const Byte *data, size_t
- #if defined(_MSC_VER) && defined(MY_CPU_ARM64)
- #include <arm64_neon.h>
- #else
-+#define __ARM_FEATURE_AES
-+#define __ARM_FEATURE_SHA2
-+#define __ARM_FEATURE_CRYPTO
- #include <arm_neon.h>
- #endif
- 
-diff --git C/Sha256Opt.c C/Sha256Opt.c
-index 4fccb33..4ed8bfe 100755
---- C/Sha256Opt.c
-+++ C/Sha256Opt.c
-@@ -224,7 +224,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size_
- 
- #if defined(__clang__) || defined(__GNUC__)
-   #ifdef MY_CPU_ARM64
--    #define ATTRIB_SHA __attribute__((__target__("+crypto")))
-+    #define ATTRIB_SHA __attribute__((__target__("crypto")))
-   #else
-     #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8")))
-   #endif
-@@ -237,6 +237,10 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size_
- #if defined(_MSC_VER) && defined(MY_CPU_ARM64)
- #include <arm64_neon.h>
- #else
-+
-+#define __ARM_FEATURE_AES
-+#define __ARM_FEATURE_SHA2
-+#define __ARM_FEATURE_CRYPTO
- #include <arm_neon.h>
- #endif
-