From ba462578ace731981a22c783308bd6818efaac42 Mon Sep 17 00:00:00 2001
From: mitaclaw <140017135+mitaclaw@users.noreply.github.com>
Date: Mon, 22 Apr 2024 00:14:34 -0700
Subject: [PATCH] Externals: Update minizip-ng to 4.0.5

Also update unzLocateFile to the minizip-ng 4.0.4+ signature and document new unused files.
---
 CMakeLists.txt                                     | 2 +-
 Externals/minizip-ng/CMakeLists.txt                | 5 ++++-
 Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e96b7ba6a9..dff598d34e 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
 dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
 
 # TODO: Some distributions might call this package "minizip" without the "-ng" suffix.
-dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip-ng)
+dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=4.0.4 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 bbc9845060..3a2e7e6b67 100644
--- a/Externals/minizip-ng/CMakeLists.txt
+++ b/Externals/minizip-ng/CMakeLists.txt
@@ -53,9 +53,12 @@ if (WIN32)
 endif()
 
 # Unused files
+#  minizip-ng/minigzip.c
+#  minizip-ng/minizip.c
 #  minizip-ng/mz_crypt_apple.c
 #  minizip-ng/mz_crypt_openssl.c
-#  minizip-ng/mz_crypt_win32.c
+#  minizip-ng/mz_crypt_winvista.c
+#  minizip-ng/mz_crypt_winxp.c
 
 target_include_directories(minizip PUBLIC minizip-ng)
 
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 223c33e0ea..659e8808a1 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -36,7 +36,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
     return;
   }
 
-  if (unzLocateFile(file, "manifest.json", nullptr) == UNZ_END_OF_LIST_OF_FILE)
+  if (unzLocateFile(file, "manifest.json", 0) == UNZ_END_OF_LIST_OF_FILE)
   {
     m_valid = false;
     m_error = "Resource pack is missing a manifest.";
@@ -63,7 +63,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
     return;
   }
 
-  if (unzLocateFile(file, "logo.png", nullptr) != UNZ_END_OF_LIST_OF_FILE)
+  if (unzLocateFile(file, "logo.png", 0) != UNZ_END_OF_LIST_OF_FILE)
   {
     unz_file_info64 logo_info{};
     unzGetCurrentFileInfo64(file, &logo_info, nullptr, 0, nullptr, 0, nullptr, 0);