diff --git a/srcpkgs/7zip/patches/armv7.patch b/srcpkgs/7zip/patches/armv7.patch deleted file mode 100644 index c8b4808aeb3..00000000000 --- 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 2db2d00cbe5..b8123872751 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 9f8add80406..ac6cf7fe69c 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 " @@ -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