[PR PATCH] 7zip: update to 24.05

[PR PATCH] 7zip: update to 24.05

[Zapeth]

[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]

There is a new pull request by Zapeth against master on the void-packages repository

https://github.com/Zapeth/void-packages 7zip-update
https://github.com/void-linux/void-packages/pull/50396

7zip: update to 24.05
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

I'm don't think `armv7.patch` is necessary anymore, but maybe someone with such a system can test to be safe.

Also I'm not sure why some of parts of `build_flags.patch` are necessary (package works fine without the entire patch), but I updated it anyway.

A patch file from https://github.com/void-linux/void-packages/pull/50396.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-7zip-update-50396.patch --]
[-- Type: text/x-diff, Size: 5315 bytes --]

From c0d5ea2d59187fdd20083190f00da1e770d7ff82 Mon Sep 17 00:00:00 2001
From: Zapeth <steami@live.at>
Date: Fri, 17 May 2024 19:42:44 +0000
Subject: [PATCH] 7zip: update to 24.05

---
 srcpkgs/7zip/patches/armv7.patch       | 22 ---------------
 srcpkgs/7zip/patches/build_flags.patch | 37 ++++++++++++--------------
 srcpkgs/7zip/template                  |  4 +--
 3 files changed, 19 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/7zip/patches/armv7.patch

diff --git a/srcpkgs/7zip/patches/armv7.patch b/srcpkgs/7zip/patches/armv7.patch
deleted file mode 100644
index c8b4808aeb3031..00000000000000
--- a/srcpkgs/7zip/patches/armv7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gitlab.alpinelinux.org/alpine/aports/-/raw/da4780262417a9446b7d13fe9bb7e83c54edb53d/main/7zip/armv7.patch
-we don't have neon on armv7
---
-diff --git a/C/SwapBytes.c b/C/SwapBytes.c
-index 0bfe95c..834fe4b 100755
---- a/C/SwapBytes.c
-+++ b/C/SwapBytes.c
-@@ -331,12 +331,12 @@ ShufBytes_256(void *items8, const void *lim8, const void *mask128_ptr)
- 
- // compile message "NEON intrinsics not available with the soft-float ABI"
- #elif defined(MY_CPU_ARM_OR_ARM64) || \
--    (defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
-+    (defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
- // #elif defined(MY_CPU_ARM64)
- 
-   #if defined(__clang__) && (__clang_major__ >= 8) \
-     || defined(__GNUC__) && (__GNUC__ >= 8)
--    #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 7)) \
-+    #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 8)) \
-         || defined(MY_CPU_ARM64)
-       #define USE_SWAP_128
-     #endif
diff --git a/srcpkgs/7zip/patches/build_flags.patch b/srcpkgs/7zip/patches/build_flags.patch
index 2db2d00cbe5604..b8123872751285 100644
--- a/srcpkgs/7zip/patches/build_flags.patch
+++ b/srcpkgs/7zip/patches/build_flags.patch
@@ -2,7 +2,7 @@ adapted from https://sources.debian.org/patches/7zip/22.01+dfsg-4/0001-Accept-De
 and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1f2ee41fd2aea9ac/community/7zip/7-zip-flags.patch
 --- a/CPP/7zip/7zip_gcc.mak
 +++ b/CPP/7zip/7zip_gcc.mak
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
  
  
  ifneq ($(CC), xlc)
@@ -11,25 +11,31 @@ and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1
  endif
  
  # for object file
-@@ -32,7 +32,7 @@
- # -save-temps
- CFLAGS_BASE_LIST = -c
+@@ -45,12 +45,12 @@ CFLAGS_DEBUG = -g
+ else
+ CFLAGS_DEBUG = -DNDEBUG
+ ifneq ($(CC), $(CROSS_COMPILE)clang)
+-LFLAGS_STRIP = -s
++LFLAGS_STRIP =
+ endif
+ endif
+ 
  # CFLAGS_BASE_LIST = -S
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
 +CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+  $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
   -fPIC
  
-@@ -94,7 +94,7 @@
+@@ -111,7 +111,7 @@ endif
  
  else
  
 -LDFLAGS = $(LDFLAGS_STATIC)
 +LDFLAGS = $(VOID_LDFLAGS) $(LDFLAGS_STATIC)
+ # -z force-bti
  # -s is not required for clang, do we need it for GCC ???
  
- #-static -static-libgcc -static-libstdc++
-@@ -149,7 +149,7 @@
+@@ -169,7 +169,7 @@ endif
  
  
  
@@ -38,21 +44,12 @@ and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1
  
  
  ifdef IS_MINGW
-@@ -190,7 +190,7 @@
+@@ -210,7 +210,7 @@ CXX_WARN_FLAGS =
  #-Wno-invalid-offsetof
  #-Wno-reorder
  
--CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
-+CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(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) $(CXX_INCLUDE_FLAGS) -o $@
++CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(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 $@
  
  STATIC_TARGET=
  ifdef COMPL_STATIC
-@@ -208,7 +208,7 @@
- # -Wl,--print-gc-sections
- 
- ifneq ($(CC), $(CROSS_COMPILE)clang)
--LFLAGS_STRIP = -s
-+LFLAGS_STRIP =
- endif
- 
- LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
diff --git a/srcpkgs/7zip/template b/srcpkgs/7zip/template
index 9f8add80406889..ac6cf7fe69c940 100644
--- a/srcpkgs/7zip/template
+++ b/srcpkgs/7zip/template
@@ -1,6 +1,6 @@
 # Template file for '7zip'
 pkgname=7zip
-version=23.01
+version=24.05
 revision=1
 short_desc="File archiver with a high compression ratio"
 maintainer="Roberto Ricci <io@r-ricci.it>"
@@ -8,7 +8,7 @@ license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.7-zip.org"
 changelog="https://www.7-zip.org/history.txt"
 distfiles="https://www.7-zip.org/a/7z${version//./}-src.tar.xz"
-checksum=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
+checksum=63f341cf80b8d287c6e945519b3da0fa75553c85572a471b7fa6e68f9a90b790
 alternatives="
  7z:7z:/usr/bin/7zip
  7z:7za:/usr/bin/7zip

Re: 7zip: update to 24.05

[r-ricci]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

New comment by r-ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/50396#issuecomment-2118407708

Comment:
> I'm don't think `armv7.patch` is necessary anymore.

Correct.

> Also I'm not sure why some of parts of `build_flags.patch` are necessary (package works fine without the entire patch), but I updated it anyway.

There are certain build flags (specified in various parts of the `common/environment` subdirectory of void-packages) which we want to always use when building all packages.
Good build systems should append the project's flags to the ones specified in environment variables such as `CFLAGS`, `CXXFLAGS`, `LDFLAGS` etc.
But 7zip's build system is a huge mess with hardcoded values which doesn't respect the environment.
You can see that by removing the patch and looking at the build log, some flags such as `-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe` are no longer passed.

Re: 7zip: update to 24.05

[r-ricci]

[-- Attachment #1: Type: text/plain, Size: 959 bytes --]

New comment by r-ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/50396#issuecomment-2118407708

Comment:
> I'm don't think `armv7.patch` is necessary anymore.

Correct.

> Also I'm not sure why some of parts of `build_flags.patch` are necessary (package works fine without the entire patch), but I updated it anyway.

There are certain build flags (specified in various parts of the `common/environment` subdirectory of void-packages) which we want to always use when building all packages.
Good build systems should append the project's flags to the ones specified in environment variables such as `CFLAGS`, `CXXFLAGS`, `LDFLAGS` etc.
But 7zip's build system is a huge mess with hardcoded values which doesn't respect the environment.
You can see that by removing the patch and looking at the build log, some flags such as `-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -pipe` are no longer passed.

Re: [PR PATCH] [Merged]: 7zip: update to 24.05

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

There's a merged pull request on the void-packages repository

7zip: update to 24.05
https://github.com/void-linux/void-packages/pull/50396

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

I'm don't think `armv7.patch` is necessary anymore, ~but maybe someone with such a system can test to be safe.~ Should be fine considering armv7 builds had no issues.

Also I'm not sure why some of parts of `build_flags.patch` are necessary (package works fine without the entire patch), but I updated it anyway.