From 64354ea5112c66021d556932bf30bdcc675bb731 Mon Sep 17 00:00:00 2001 From: tarsin Date: Sat, 22 Jul 2023 10:16:27 +0800 Subject: [PATCH] Xz 5.4.3 --- .../main/cpp/0001-Don-t-build-other-binarys.patch | 14 +++++++------- app/src/main/cpp/CMakeLists.txt | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/cpp/0001-Don-t-build-other-binarys.patch b/app/src/main/cpp/0001-Don-t-build-other-binarys.patch index 2171ac89e..0efeed5a0 100644 --- a/app/src/main/cpp/0001-Don-t-build-other-binarys.patch +++ b/app/src/main/cpp/0001-Don-t-build-other-binarys.patch @@ -1,6 +1,6 @@ -From fc9fb0ea245259e346ab46c334f03b557fe63b6b Mon Sep 17 00:00:00 2001 +From 2bda36800a5424c44378bbc0cc8bb5d26a0f34fa Mon Sep 17 00:00:00 2001 From: tarsin -Date: Tue, 22 Nov 2022 12:37:12 +0800 +Date: Sat, 22 Jul 2023 08:30:20 +0800 Subject: [PATCH] Don't build other binarys --- @@ -8,19 +8,19 @@ Subject: [PATCH] Don't build other binarys 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 01c73cd..b461e68 100644 +index 55cd358..52b57aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -592,7 +592,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG) +@@ -962,7 +962,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG) # xzdec ############################################################################# --if(HAVE_GETOPT_LONG) +-if(HAVE_GETOPT_LONG AND HAVE_DECODERS) +if(0) add_executable(xzdec src/common/sysdefs.h src/common/tuklib_common.h -@@ -630,7 +630,7 @@ endif() +@@ -1008,7 +1008,7 @@ endif() # xz ############################################################################# @@ -30,5 +30,5 @@ index 01c73cd..b461e68 100644 src/common/mythread.h src/common/sysdefs.h -- -2.39.2 +2.41.0 diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index b5c67f7b7..6c910c1d7 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -20,9 +20,11 @@ endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") get_filename_component(deps "../_deps" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}") set(FETCHCONTENT_BASE_DIR ${deps}) +set(BUILD_TESTING 0) + FetchContent_Declare(liblzma GIT_REPOSITORY https://git.tukaani.org/xz.git - GIT_TAG v5.4.1 + GIT_TAG v5.4.3 PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || cd . )