From d674672ce270fb8847808b3afec7fa47a9ce511a Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:21:53 +0800
Subject: [PATCH] Update libarchive to v3.7.2

---
 app/src/main/cpp/0001-Hide-symbols.patch     | 29 --------------------
 app/src/main/cpp/0002-Insert-link-libs.patch | 25 -----------------
 app/src/main/cpp/CMakeLists.txt              |  5 ++--
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 app/src/main/cpp/0001-Hide-symbols.patch
 delete mode 100644 app/src/main/cpp/0002-Insert-link-libs.patch

diff --git a/app/src/main/cpp/0001-Hide-symbols.patch b/app/src/main/cpp/0001-Hide-symbols.patch
deleted file mode 100644
index 2e61d1e09..000000000
--- a/app/src/main/cpp/0001-Hide-symbols.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 57da49f9b0ed8538573f6cfe289f835ee0078eec Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Sat, 22 Jul 2023 17:50:08 +0800
-Subject: [PATCH] Hide symbols
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 646484b7..67a71272 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2060,10 +2060,10 @@ SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
- SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
- CHECK_C_SOURCE_COMPILES("void __attribute__((visibility(\"default\"))) foo(void);
- int main() { return 0; }" HAVE_VISIBILITY_ATTR)
--IF (HAVE_VISIBILITY_ATTR)
-+IF (0)
-   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-   ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY)
--ENDIF(HAVE_VISIBILITY_ATTR)
-+ENDIF(0)
- SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
- 
- # Generate "config.h" from "build/cmake/config.h.in"
--- 
-2.41.0
-
diff --git a/app/src/main/cpp/0002-Insert-link-libs.patch b/app/src/main/cpp/0002-Insert-link-libs.patch
deleted file mode 100644
index c4cf952a4..000000000
--- a/app/src/main/cpp/0002-Insert-link-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c9298fd6dc0a8b04dd4b2247118b9cb895c46e58 Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Sat, 23 Jul 2022 16:05:36 +0800
-Subject: [PATCH 2/2] Insert link libs
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 713e3bc5..7247640d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -415,7 +415,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
-   # #  endif
- ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
- 
--SET(ADDITIONAL_LIBS "")
-+SET(ADDITIONAL_LIBS ${LIBARCHIVE_CUSTOM_LIBS})
- #
- # Find ZLIB
- #
--- 
-2.39.2
-
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index a6df0762b..1f6b6666f 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -68,9 +68,8 @@ option(ENABLE_TEST OFF)
 SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
 
 FetchContent_Declare(libarchive
-        GIT_REPOSITORY https://github.com/libarchive/libarchive
-        GIT_TAG v3.7.0
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Hide-symbols.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
+        GIT_REPOSITORY https://github.com/FooIbar/libarchive.git
+        GIT_TAG v3.7.2
         )
 
 FetchContent_MakeAvailable(libarchive)