From a3ac2a0c14cfab5d1bfce1b9011a4c2667918e6d Mon Sep 17 00:00:00 2001
From: xdavidwu <xdavidwuph@gmail.com>
Date: Sat, 8 Jul 2023 21:50:26 +0800
Subject: [PATCH] 7zip-unrar: 23.01

---
 7zip-unrar/7-zip-flags.patch          | 49 +++++++++++++++++++++++++++
 {7zip => 7zip-unrar}/7-zip-musl.patch |  0
 {7zip => 7zip-unrar}/APKBUILD         | 14 ++++----
 7zip/7-zip-flags.patch                | 28 ---------------
 4 files changed, 56 insertions(+), 35 deletions(-)
 create mode 100644 7zip-unrar/7-zip-flags.patch
 rename {7zip => 7zip-unrar}/7-zip-musl.patch (100%)
 rename {7zip => 7zip-unrar}/APKBUILD (77%)
 delete mode 100644 7zip/7-zip-flags.patch

diff --git a/7zip-unrar/7-zip-flags.patch b/7zip-unrar/7-zip-flags.patch
new file mode 100644
index 0000000..dea4c07
--- /dev/null
+++ b/7zip-unrar/7-zip-flags.patch
@@ -0,0 +1,49 @@
+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)
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
++CFLAGS_WARN_WALL = -Wall -Wextra
+ endif
+ 
+ # for object file
+@@ -32,7 +32,7 @@ endif
+ # -save-temps
+ CFLAGS_BASE_LIST = -c
+ # 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 \
+  -fPIC
+ 
+@@ -149,7 +149,7 @@ endif
+ 
+ 
+ 
+-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) -o $@
+ 
+ 
+ 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:
+ 	$(CC) $(CFLAGS) -E $(SHOW_PREDEF)  ../../../../C/CpuArch.c > predef_cc_log
+ #	$(CC) $(CFLAGS) -E -dM -  < /dev/null
+ predef_cxx:
+-	$(CXX) $(CFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log
++	$(CXX) $(CXXFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log
+ 
+ predef: predef_cc predef_cxx
+ 
diff --git a/7zip/7-zip-musl.patch b/7zip-unrar/7-zip-musl.patch
similarity index 100%
rename from 7zip/7-zip-musl.patch
rename to 7zip-unrar/7-zip-musl.patch
diff --git a/7zip/APKBUILD b/7zip-unrar/APKBUILD
similarity index 77%
rename from 7zip/APKBUILD
rename to 7zip-unrar/APKBUILD
index e49f647..95ba3bf 100644
--- a/7zip/APKBUILD
+++ b/7zip-unrar/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
 pkgname=7zip-unrar
-pkgver=22.01
+pkgver=23.01
 _pkgver=${pkgver//./}
-pkgrel=2
+pkgrel=0
 pkgdesc="File archiver with a high compression ratio"
 url="https://7-zip.org/"
 arch="all"
@@ -12,11 +12,11 @@ source="https://7-zip.org/a/7z$_pkgver-src.tar.xz
 	7-zip-flags.patch
 	7-zip-musl.patch
 	"
-depends="!p7zip" # conflicts /usr/bin/7z
 builddir="$srcdir"
 
-provides="7zip-virtual"
-provider_priority=10
+provides="7zip-virtual p7zip=$pkgver-r$pkgrel"
+replaces="p7zip"
+provider_priority=100
 
 build() {
 	cd CPP/7zip/Bundles/Alone2
@@ -46,7 +46,7 @@ package() {
 }
 
 sha512sums="
-3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a  7z2201-src.tar.xz
-1b6928f62f62e27cc948a0c1fe44c085a2e49f85e5a14bef186c613335ed67ccc63649162cef55ab4431e4fec70be5bd9d61f4c76bf702dd9c2c08cd1993e7be  7-zip-flags.patch
+e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986  7z2301-src.tar.xz
+dfecb69861d00ee47311d83930adf80321b3c95ae01ce325677bde7aee6aa880a1979b0aa2909d9acb7a88ff31f910ac545ac218a0b5fd9e1270df2276b46d44  7-zip-flags.patch
 c652a87ad95f61901820adb61f3d1ceacedcb8aeaf9e89b2b728b7372eff67d9669eb363d5b2d2fb848ff2d8c5a727134fe13cc77d1215df7b2d32fe87711ebf  7-zip-musl.patch
 "
diff --git a/7zip/7-zip-flags.patch b/7zip/7-zip-flags.patch
deleted file mode 100644
index 963037c..0000000
--- a/7zip/7-zip-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
---- a/CPP/7zip/7zip_gcc.mak	2021-11-20 04:00:00.000000000 -0500
-+++ b/CPP/7zip/7zip_gcc.mak	2021-12-16 11:01:16.236763027 -0500
-@@ -14,13 +14,13 @@
- 
- 
- ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra
- endif
- 
- # for object file
- CFLAGS_BASE_LIST = -c
- # 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 \
-  -fPIC
- 
-@@ -162,7 +162,7 @@
- $(O):
- 	$(MY_MKDIR) $(O)
- 
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- 	$(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
- 
-- 
2.43.0