From 07cce5bbad4a17b001abc5e74e5f9ff8f60233b4 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 22 Jul 2023 09:59:33 +0800
Subject: [PATCH] Libarchive 3.7.0

---
 .../cpp/0001-Don-t-build-shared-lib.patch     | 38 -------------------
 app/src/main/cpp/CMakeLists.txt               |  9 ++++-
 2 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/cpp/0001-Don-t-build-shared-lib.patch

diff --git a/app/src/main/cpp/0001-Don-t-build-shared-lib.patch b/app/src/main/cpp/0001-Don-t-build-shared-lib.patch
deleted file mode 100644
index e16abcf5d..000000000
--- a/app/src/main/cpp/0001-Don-t-build-shared-lib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2a67861e6f06794f3671c4988bac12330d8422e3 Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Fri, 27 May 2022 23:21:20 +0800
-Subject: [PATCH 1/2] Don't build shared lib
-
----
- libarchive/CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index ff7ade00..00c2e170 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -242,12 +242,6 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
- ENDIF()
- 
--# Libarchive is a shared library
--ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
--TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
--TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
--SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
--
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -260,7 +254,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
--- 
-2.39.2
-
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index b31018e7f..b5c67f7b7 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -50,13 +50,18 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
 SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)
 
+option(ENABLE_TAR OFF)
+option(ENABLE_CPIO OFF)
+option(ENABLE_CAT OFF)
+option(ENABLE_UNZIP OFF)
+
 # Configure libarchive link's static lib
 SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
 
 FetchContent_Declare(libarchive
         GIT_REPOSITORY https://github.com/libarchive/libarchive
-        GIT_TAG v3.6.2
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-shared-lib.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
+        GIT_TAG v3.7.0
+        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
         )
 
 FetchContent_MakeAvailable(libarchive)