From b0ed19307e361e1cfbb6169da1f6248be02b7b35 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 4 Jan 2024 09:55:53 +0000 Subject: [PATCH 1/3] Add include to zlib.h as it uses the structures defined in the zlib.h Up until now, the minizip was including this header file, but minizip-ng does not and it causing the build to fail. If the file uses structures defined in the zlib.h it should explicitly include it. --- src/util/ZipSerialize.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/ZipSerialize.cpp b/src/util/ZipSerialize.cpp index c3236cc77..0e7d3fae4 100644 --- a/src/util/ZipSerialize.cpp +++ b/src/util/ZipSerialize.cpp @@ -22,6 +22,7 @@ #include "DateTime.h" #include "log.h" +#include #include #include #ifdef _WIN32 From 4b3310b7371ca046c651aada98e6a1edfca5fbaf Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 4 Jan 2024 10:02:11 +0000 Subject: [PATCH 2/3] Support minizip version 3 and 4 as well minizip-ng versions are 3 and 4, so support it in CMakeList as well --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fd6bf565..cb3b70763 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ find_package(ZLIB REQUIRED) find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19 if(UNIX AND NOT APPLE) find_package(PkgConfig) - pkg_check_modules(MINIZIP minizip IMPORTED_TARGET minizip<2.0.0) + pkg_check_modules(MINIZIP minizip IMPORTED_TARGET) endif() find_package(SWIG) find_package(JNI) From aa8a9ac6f569a34159b8b48a09931af9ef8e77ee Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Wed, 24 Jan 2024 12:50:38 +0000 Subject: [PATCH 3/3] Fix install deps in Fedora Github action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8ae118e8..736e6a2c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: - name: Install Deps run: | dnf install -y --setopt=install_weak_deps=False \ - git gcc-c++ cmake rpm-build xml-security-c-devel zlib-devel vim-common doxygen boost-test swig python3-devel java-1.8.0-openjdk-devel xsd + git gcc-c++ cmake rpm-build xml-security-c-devel zlib-devel vim-common doxygen boost-test swig python3-devel java-1.8.0-openjdk-devel xsd minizip-devel - name: Install CMake if: matrix.container == 'fedora:39' run: |