From a619b6d6d26cf10538450cd4192a96425d3ce825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= <joshua@vandaele.software>
Date: Sat, 11 Jan 2025 12:19:37 +0100
Subject: [PATCH] Fix build with minizip-ng 4.0.8

---
 CMakeLists.txt                                     | 2 +-
 Externals/minizip-ng/CMakeLists.txt                | 9 +++++++--
 Externals/minizip-ng/minizip-ng                    | 2 +-
 Source/Core/Common/MinizipUtil.h                   | 2 +-
 Source/Core/DiscIO/VolumeVerifier.cpp              | 2 +-
 Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 4 +++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 819ea0440905..3c47f4ff3a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -675,7 +675,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
 add_subdirectory(Externals/zlib-ng)
 
 dolphin_find_optional_system_library_pkgconfig(MINIZIP
-  "minizip>=4.0.4" minizip::minizip Externals/minizip-ng
+  "minizip>=4.0.8" minizip::minizip Externals/minizip-ng
 )
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
diff --git a/Externals/minizip-ng/CMakeLists.txt b/Externals/minizip-ng/CMakeLists.txt
index 3a2e7e6b670b..7b9c319d52b5 100644
--- a/Externals/minizip-ng/CMakeLists.txt
+++ b/Externals/minizip-ng/CMakeLists.txt
@@ -2,8 +2,13 @@ project(minizip C)
 
 add_library(minizip STATIC
   minizip-ng/mz.h
-  minizip-ng/mz_compat.c
-  minizip-ng/mz_compat.h
+  # minizip-ng/compat/crypt.h
+  minizip-ng/compat/ioapi.c
+  minizip-ng/compat/ioapi.h
+  minizip-ng/compat/unzip.c
+  minizip-ng/compat/unzip.h
+  # minizip-ng/compat/zip.c
+  # minizip-ng/compat/zip.h
   minizip-ng/mz_crypt.c
   minizip-ng/mz_crypt.h
   minizip-ng/mz_os.c
diff --git a/Externals/minizip-ng/minizip-ng b/Externals/minizip-ng/minizip-ng
index 3eed562ef0ea..55db144e0302 160000
--- a/Externals/minizip-ng/minizip-ng
+++ b/Externals/minizip-ng/minizip-ng
@@ -1 +1 @@
-Subproject commit 3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70
+Subproject commit 55db144e03027b43263e5ebcb599bf0878ba58de
diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h
index 29b365c02871..529eac3669a1 100644
--- a/Source/Core/Common/MinizipUtil.h
+++ b/Source/Core/Common/MinizipUtil.h
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include <mz_compat.h>
+#include <compat/unzip.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/ScopeGuard.h"
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
index a4725cbbe25c..85bf41046373 100644
--- a/Source/Core/DiscIO/VolumeVerifier.cpp
+++ b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -12,8 +12,8 @@
 #include <string_view>
 #include <unordered_set>
 
+#include <compat/unzip.h>
 #include <mbedtls/md5.h>
-#include <mz_compat.h>
 #include <pugixml.hpp>
 
 #include "Common/Align.h"
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 117c3cc31cfb..a06d77d8f451 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -6,7 +6,9 @@
 #include <algorithm>
 #include <memory>
 
-#include <mz_compat.h>
+#include <compat/unzip.h>
+#include <mz.h>
+
 #include <mz_os.h>
 
 #include "Common/CommonPaths.h"