From f049a52109acc6a07757a04adbd09b988c969cf0 Mon Sep 17 00:00:00 2001
From: Ofek Shaked <ofek.shaked@aquasec.com>
Date: Thu, 29 Aug 2024 11:19:51 +0300
Subject: [PATCH] Add release for Wireshark 4.4.0 Disable newly added minizipng
 for github actions builds because it requires bcrypt which is not found and
 seems to be a hassle to install. This has no effect on the built plugins.

---
 .github/actions/install-wireshark-headers-windows/action.yml | 2 +-
 .github/workflows/pr.yml                                     | 3 ++-
 .github/workflows/release.yml                                | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/actions/install-wireshark-headers-windows/action.yml b/.github/actions/install-wireshark-headers-windows/action.yml
index 3c6d8f6..5bbd633 100644
--- a/.github/actions/install-wireshark-headers-windows/action.yml
+++ b/.github/actions/install-wireshark-headers-windows/action.yml
@@ -8,7 +8,7 @@ runs:
         cd build
         set WIRESHARK_BASE_DIR=..\
         set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
-        cmake -G "Visual Studio 17 2022" -A x64 ..\wireshark
+        cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_MINIZIPNG=Off ..\wireshark
       shell: cmd
     - name: Install headers
       run: |
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 0f456fd..70ad471 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         # macos-14 is ARM64, macos-13 is x86-64
         os: [ubuntu-latest, macos-14, macos-13, windows-latest]
-        wireshark_version: [wireshark-4.2.6]
+        wireshark_version: [wireshark-4.2.6, wireshark-4.4.0]
         include:
           # Ubuntu 22.04 Wireshark package version
           - os: ubuntu-latest
@@ -79,6 +79,7 @@ jobs:
         set WIRESHARK_BASE_DIR=%CD%
         set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
         set WERROR=y
+        set ENABLE_MINIZIPNG=Off
         call scripts\cmake.bat
         call scripts\build.bat
       shell: cmd
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 357fde4..a8bbf38 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         # macos-14 is ARM64, macos-13 is x86-64
         os: [ubuntu-latest, macos-14, macos-13, windows-latest]
-        wireshark_version: [wireshark-4.2.6]
+        wireshark_version: [wireshark-4.2.6, wireshark-4.4.0]
         include:
           # Ubuntu 22.04 Wireshark package version
           - os: ubuntu-latest
@@ -104,6 +104,7 @@ jobs:
         set WIRESHARK_BASE_DIR=%CD%
         set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
         set WERROR=y
+        set ENABLE_MINIZIPNG=Off
         call scripts\cmake.bat
         call scripts\build.bat
       shell: cmd