~xdavidwu/apkbuilds

1d309dcaa3e53f958c01c914560372ede21e49ff — Pinghao Wu a month ago 7b3be65
7zip-unrar: sync from aports to 24.08
3 files changed, 46 insertions(+), 60 deletions(-)

M 7zip-unrar/7-zip-flags.patch
M 7zip-unrar/7-zip-musl.patch
M 7zip-unrar/APKBUILD
M 7zip-unrar/7-zip-flags.patch => 7zip-unrar/7-zip-flags.patch +20 -20
@@ 1,8 1,8 @@
diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
index a8eb6e3..7a16e9e 100755
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
index a8eb6e3..7a16e9e 100755
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
 
 
 ifneq ($(CC), xlc)


@@ 11,16 11,25 @@ index a8eb6e3..7a16e9e 100755
 endif
 
 # for object file
@@ -32,7 +32,7 @@ endif
 # -save-temps
 CFLAGS_BASE_LIST = -c
@@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g
 else
 CFLAGS_DEBUG = -DNDEBUG
 ifneq ($(CC), $(CROSS_COMPILE)clang)
-LFLAGS_STRIP = -s
+LFLAGS_STRIP =
 endif
 endif
 
@@ -50,7 +50,7 @@ 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
 
@@ -149,7 +149,7 @@ endif
@@ -169,7 +169,7 @@ endif
 
 
 


@@ 29,16 38,7 @@ index a8eb6e3..7a16e9e 100755
 
 
 ifdef IS_MINGW
@@ -208,7 +208,7 @@ $(O):
 # -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)
@@ -1285,7 +1285,7 @@ predef_cc:
@@ -1343,7 +1343,7 @@ predef_cc:
 	$(CC) $(CFLAGS) -E $(SHOW_PREDEF)  ../../../../C/CpuArch.c > predef_cc_log
 #	$(CC) $(CFLAGS) -E -dM -  < /dev/null
 predef_cxx:

M 7zip-unrar/7-zip-musl.patch => 7zip-unrar/7-zip-musl.patch +10 -35
@@ 1,28 1,16 @@
diff -ru a/C/CpuArch.c b/C/CpuArch.c
--- a/C/CpuArch.c	2021-07-13 05:10:00.000000000 -0400
+++ b/C/CpuArch.c	2022-03-05 11:08:23.363390656 -0500
@@ -421,8 +421,6 @@
 
 #ifdef USE_HWCAP
 
-#include <asm/hwcap.h>
-
   #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
   BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP)  & (HWCAP_  ## name2)) ? 1 : 0; }
 
diff -ru a/C/Threads.c b/C/Threads.c
--- a/C/Threads.c	2021-12-21 08:00:00.000000000 -0500
+++ b/C/Threads.c	2022-03-05 11:07:47.203504536 -0500
@@ -257,7 +257,7 @@
diff -ru a/C/Threads.c b/C/Threads.c
--- a/C/Threads.c	2021-12-21 08:00:00.000000000 -0500
+++ b/C/Threads.c	2022-03-05 11:07:47.203504536 -0500
@@ -265,7 +265,7 @@
       */
 
       // ret2 =
-      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
+      //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
       // if (ret2) ret = ret2;
       #endif
 #endif
     }
@@ -267,14 +267,12 @@
@@ -275,14 +275,12 @@
     if (!ret)
     {
       p->_created = 1;


@@ 37,10 25,10 @@ diff -ru a/C/Threads.c b/C/Threads.c
     }
   }
   // ret2 =
diff -ru a/C/Threads.h b/C/Threads.h
--- a/C/Threads.h	2021-12-21 08:00:00.000000000 -0500
+++ b/C/Threads.h	2022-03-05 11:07:47.203504536 -0500
@@ -19,6 +19,7 @@
diff -ru a/C/Threads.h b/C/Threads.h
--- a/C/Threads.h	2021-12-21 08:00:00.000000000 -0500
+++ b/C/Threads.h	2022-03-05 11:07:47.203504536 -0500
@@ -29,6 +29,7 @@
 #endif
 
 #include <pthread.h>


@@ 48,16 36,3 @@ diff -ru a/C/Threads.h b/C/Threads.h
 
 #endif
 
diff -ru a/CPP/Windows/SystemInfo.cpp b/CPP/Windows/SystemInfo.cpp
--- a/CPP/Windows/SystemInfo.cpp	2021-11-06 04:19:39.000000000 -0400
+++ b/CPP/Windows/SystemInfo.cpp	2022-03-05 11:26:27.178812388 -0500
@@ -36,9 +36,6 @@
 #endif
 */
 
-#ifdef MY_CPU_ARM_OR_ARM64
-#include <asm/hwcap.h>
-#endif
 #endif
 
 #ifdef __linux__

M 7zip-unrar/APKBUILD => 7zip-unrar/APKBUILD +16 -5
@@ 1,12 1,13 @@
# Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
pkgname=7zip-unrar
pkgver=23.01
pkgver=24.08
_pkgver=${pkgver//./}
pkgrel=0
pkgdesc="File archiver with a high compression ratio"
url="https://7-zip.org/"
arch="all"
license="LGPL-2.0-only"
makedepends="make build-base"
subpackages="$pkgname-doc"
source="https://7-zip.org/a/7z$_pkgver-src.tar.xz
	7-zip-flags.patch


@@ 18,6 19,8 @@ provides="7zip-virtual p7zip=$pkgver-r$pkgrel"
replaces="p7zip"
provider_priority=100

patch_args="-p1 --binary"

build() {
	cd CPP/7zip/Bundles/Alone2
	mkdir -p b/g


@@ 31,11 34,19 @@ build() {

check() {
	# no proper test suite so just try to compress and decompress some files
	rm -rf "$builddir"/tmp
	cd "$builddir"
	mkdir tmp

	CPP/7zip/Bundles/Alone2/b/g/7zz a tmp/7z$_pkgver-src.7z Asm C CPP DOC
	cd tmp
	../CPP/7zip/Bundles/Alone2/b/g/7zz x 7z$_pkgver-src.7z
	# TODO: check if extracted result is identical

	# check if extracted result is identical
	diff -r ../Asm Asm
	diff -r ../C C
	diff -r ../CPP CPP
	diff -r ../DOC DOC
}

package() {


@@ 46,7 57,7 @@ package() {
}

sha512sums="
e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986  7z2301-src.tar.xz
dfecb69861d00ee47311d83930adf80321b3c95ae01ce325677bde7aee6aa880a1979b0aa2909d9acb7a88ff31f910ac545ac218a0b5fd9e1270df2276b46d44  7-zip-flags.patch
c652a87ad95f61901820adb61f3d1ceacedcb8aeaf9e89b2b728b7372eff67d9669eb363d5b2d2fb848ff2d8c5a727134fe13cc77d1215df7b2d32fe87711ebf  7-zip-musl.patch
889e9aeaa629d6474a609a15066b2fa7b1353fa5e7255e044297591f565b08b16b885d44f4c4a046f2f9da189599ace300cf61fd9ac0e7bc316fb9d96a18a039  7z2408-src.tar.xz
1bacb622842e48b12e7d0557b2cae11aa2a51119308857bfd3479e11d13410b7bbde2fdee74a3645459cf2ca9a9a98c56bde82beee79ec59a46a2f406f7310f5  7-zip-flags.patch
dd5c38548c348a850d6e82ed42ba2bdc4b9e363fa946e67158a1f042179d8155a8837c89d732f748ffd1ba948bf2b7cd456f6db50e122ebbd7ba9c8a1cd7b04b  7-zip-musl.patch
"