From f8e46bf63066eeb82a6d6ad6ca52b66369e59b58 Mon Sep 17 00:00:00 2001 From: Rens Dofferhoff Date: Tue, 5 Dec 2023 11:53:00 +0100 Subject: [PATCH] do not specify compression and update libarchive to level versions across platforms --- Desktop/data/exporters/jaspexporter.cpp | 1 - conanfile.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Desktop/data/exporters/jaspexporter.cpp b/Desktop/data/exporters/jaspexporter.cpp index 0c6dee8e59..32932c81a9 100644 --- a/Desktop/data/exporters/jaspexporter.cpp +++ b/Desktop/data/exporters/jaspexporter.cpp @@ -49,7 +49,6 @@ void JASPExporter::saveDataSet(const std::string &path, std::function a = archive_write_new(); archive_write_set_format_zip(a); - archive_write_set_compression_gzip(a); #ifdef _WIN32 if (archive_write_open_filename_w(a, tq(path).toStdWString().c_str()) != ARCHIVE_OK) diff --git a/conanfile.txt b/conanfile.txt index b535f55480..f0e1d80fcf 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -9,7 +9,7 @@ [requires] boost/[>=1.82.0 <2.0.0] zlib/1.3 -libarchive/3.6.2 +libarchive/3.7.2 zstd/1.5.2 jsoncpp/1.9.5 openssl/3.0.10