From 7e056a381694e0fd0b791b9fd06d87d391f461c0 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 31 Dec 2024 23:55:30 +0900 Subject: [PATCH] minizip-ng: add version 4.0.7 (#26112) * minizip-ng: add version 4.0.7 * rename windows library names in 4.0.7 --- recipes/minizip-ng/all/conandata.yml | 3 +++ recipes/minizip-ng/all/conanfile.py | 2 +- recipes/minizip-ng/config.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/minizip-ng/all/conandata.yml b/recipes/minizip-ng/all/conandata.yml index 5c7d70a9a8713..1444e30040e96 100644 --- a/recipes/minizip-ng/all/conandata.yml +++ b/recipes/minizip-ng/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "4.0.7": + url: "https://github.com/zlib-ng/minizip-ng/archive/4.0.7.tar.gz" + sha256: "a87f1f734f97095fe1ef0018217c149d53d0f78438bcb77af38adc21dff2dfbc" "4.0.6": url: "https://github.com/zlib-ng/minizip-ng/archive/4.0.6.tar.gz" sha256: "e96ed3866706a67dbed05bf035e26ef6b60f408e1381bf0fe9af17fe2c0abebc" diff --git a/recipes/minizip-ng/all/conanfile.py b/recipes/minizip-ng/all/conanfile.py index 6185768b2d0c8..11cc0555a2c52 100644 --- a/recipes/minizip-ng/all/conanfile.py +++ b/recipes/minizip-ng/all/conanfile.py @@ -162,7 +162,7 @@ def package_info(self): self.cpp_info.set_property("pkg_config_name", "minizip") # TODO: back to global scope in conan v2 once cmake_find_package_* generators removed - prefix = "lib" if is_msvc(self) or self._is_clang_cl else "" + prefix = "lib" if Version(self.version) < "4.0.7" and (is_msvc(self) or self._is_clang_cl) else "" suffix = "" if self.options.mz_compatibility else "-ng" self.cpp_info.components["minizip"].libs = [f"{prefix}minizip{suffix}"] if self.options.with_lzma: diff --git a/recipes/minizip-ng/config.yml b/recipes/minizip-ng/config.yml index 580a769b6b0a8..9b580772b2d89 100644 --- a/recipes/minizip-ng/config.yml +++ b/recipes/minizip-ng/config.yml @@ -1,4 +1,6 @@ versions: + "4.0.7": + folder: all "4.0.6": folder: all "4.0.5":