From 8ea2bb00a5fc4392d832eccd5a436c5696187ba1 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:41:57 +0200 Subject: [PATCH 1/4] bump deps & use version range for xz_utils & zstd --- recipes/libarchive/all/conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py index c68aabe657d31..15dbf8d0b413c 100644 --- a/recipes/libarchive/all/conanfile.py +++ b/recipes/libarchive/all/conanfile.py @@ -93,7 +93,7 @@ def requirements(self): if self.options.with_iconv: self.requires("libiconv/1.17") if self.options.with_pcreposix: - self.requires("pcre2/10.42") + self.requires("pcre2/10.44") if self.options.with_nettle: self.requires("nettle/3.9.1") if self.options.with_openssl: @@ -101,17 +101,17 @@ def requirements(self): if self.options.with_libb2: self.requires("libb2/20190723") if self.options.with_lz4: - self.requires("lz4/1.9.4") + self.requires("lz4/1.10.0") if self.options.with_lzo: self.requires("lzo/2.10") if self.options.with_lzma: - self.requires("xz_utils/5.4.5") + self.requires("xz_utils/[>=5.4.5 <6]") if self.options.with_zstd: - self.requires("zstd/1.5.5") + self.requires("zstd/[>=1.5 <1.6]") if self.options.get_safe("with_mbedtls"): - self.requires("mbedtls/3.5.1") + self.requires("mbedtls/3.6.1") if self.options.get_safe("with_pcre2"): - self.requires("pcre2/10.43") + self.requires("pcre2/10.44") def validate(self): if self.settings.os != "Windows" and self.options.with_cng: From cddd985ee37e099c184404bdda4b6782886b0c39 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:42:39 +0200 Subject: [PATCH 2/4] depends on pcre instead of pcre2 when with_pcreposix is enabled --- recipes/libarchive/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py index 15dbf8d0b413c..e2e14709b0390 100644 --- a/recipes/libarchive/all/conanfile.py +++ b/recipes/libarchive/all/conanfile.py @@ -93,7 +93,7 @@ def requirements(self): if self.options.with_iconv: self.requires("libiconv/1.17") if self.options.with_pcreposix: - self.requires("pcre2/10.44") + self.requires("pcre/8.45") if self.options.with_nettle: self.requires("nettle/3.9.1") if self.options.with_openssl: From 2fd08aedf85b44ac9504740021a5616872942f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Fri, 13 Sep 2024 07:54:26 +0200 Subject: [PATCH 3/4] Update recipes/libarchive/all/conanfile.py --- recipes/libarchive/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py index e2e14709b0390..0fbd1da06d28a 100644 --- a/recipes/libarchive/all/conanfile.py +++ b/recipes/libarchive/all/conanfile.py @@ -101,7 +101,7 @@ def requirements(self): if self.options.with_libb2: self.requires("libb2/20190723") if self.options.with_lz4: - self.requires("lz4/1.10.0") + self.requires("lz4/1.9.4") if self.options.with_lzo: self.requires("lzo/2.10") if self.options.with_lzma: From f4a9758edd83ed6ab0d2ae4dfbc465c332720e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 16 Sep 2024 09:38:10 +0200 Subject: [PATCH 4/4] Fix conflicts --- recipes/libarchive/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py index 0fbd1da06d28a..ee0e26469819f 100644 --- a/recipes/libarchive/all/conanfile.py +++ b/recipes/libarchive/all/conanfile.py @@ -111,7 +111,7 @@ def requirements(self): if self.options.get_safe("with_mbedtls"): self.requires("mbedtls/3.6.1") if self.options.get_safe("with_pcre2"): - self.requires("pcre2/10.44") + self.requires("pcre2/10.43") def validate(self): if self.settings.os != "Windows" and self.options.with_cng: