From 0e54ec5357bb25a0394a35c65240c60f80658d24 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 21 Dec 2024 23:39:42 -0800 Subject: [PATCH 1/2] update libzip to current upstream plus patches --- depends/CMakeLists.txt | 2 ++ depends/libzip | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 9dd3ac7e10..4266740bcd 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -71,6 +71,8 @@ set(LIBZIP_DO_INSTALL OFF CACHE BOOL "") add_subdirectory(libzip) if(MSVC) target_compile_options(zip PRIVATE /wd4244) +elseif(UNIX) + set_target_properties(zip PROPERTIES COMPILE_FLAGS "-Wno-stringop-truncation") endif() set(XLSXIO_USE_DFHACK_LIBS ON CACHE BOOL "") diff --git a/depends/libzip b/depends/libzip index fc4a77ea28..8e513eb5c8 160000 --- a/depends/libzip +++ b/depends/libzip @@ -1 +1 @@ -Subproject commit fc4a77ea28eb5eba0ecd11443f291335ec3d2aa0 +Subproject commit 8e513eb5c876991535ba86480aa96f633edb0e64 From b2f4d719dd57f029b640a98a240c590025bb5263 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 21 Dec 2024 23:44:21 -0800 Subject: [PATCH 2/2] include warning for older gcc versions --- depends/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 4266740bcd..6b23c1f527 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -72,7 +72,7 @@ add_subdirectory(libzip) if(MSVC) target_compile_options(zip PRIVATE /wd4244) elseif(UNIX) - set_target_properties(zip PROPERTIES COMPILE_FLAGS "-Wno-stringop-truncation") + set_target_properties(zip PROPERTIES COMPILE_FLAGS "-Wno-stringop-truncation -Wno-stringop-overflow") endif() set(XLSXIO_USE_DFHACK_LIBS ON CACHE BOOL "")