From 509ab077634aac3592e20acdf24f5fe668ea2d2c Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Tue, 28 Dec 2021 08:52:08 +0100 Subject: [PATCH] Require minizip<2.0.0 aka. zlib minizip, not minizip-ng Original zlib minizip and newer minizip-ng are ABI incompatible. tdesktop bundles old zlib minizip, but systems such as OpenBSD ship minizip-ng as their "minizip" package. http://zlib.net/ shows 1.2.11 as the latest version as of today. Require the same major version to prevent detecting minizip-ng as zlib minizip breaking the build. --- external/minizip/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/minizip/CMakeLists.txt b/external/minizip/CMakeLists.txt index 8a65649..b9f8596 100644 --- a/external/minizip/CMakeLists.txt +++ b/external/minizip/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(desktop-app::external_minizip ALIAS external_minizip) if (DESKTOP_APP_USE_PACKAGED) find_package(PkgConfig REQUIRED) - pkg_check_modules(MINIZIP IMPORTED_TARGET minizip) + pkg_check_modules(MINIZIP IMPORTED_TARGET minizip<2.0.0) if (MINIZIP_FOUND) target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP)