From 79a7bf02eb934dcf924d9f5cde55ba17d41643bf Mon Sep 17 00:00:00 2001
From: Tillmann Karras <tilkax@gmail.com>
Date: Sat, 28 May 2022 23:19:55 +0100
Subject: [PATCH] CMake: rename minizip to minizip-ng

minizip-ng is the new name used by the upstream project as well as all
distros other than Fedora (but it looks like it will be renamed there).
---
 CMakeLists.txt                                     | 2 +-
 Externals/minizip/CMakeLists.txt                   | 2 +-
 Source/Core/Common/CMakeLists.txt                  | 2 +-
 Source/Core/Common/MinizipUtil.h                   | 2 +-
 Source/Core/DiscIO/CMakeLists.txt                  | 2 +-
 Source/Core/DiscIO/VolumeVerifier.cpp              | 2 +-
 Source/Core/UICommon/CMakeLists.txt                | 2 +-
 Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df7c1b8823..a75b52109e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -753,7 +753,7 @@ else()
   add_subdirectory(Externals/zlib)
 endif()
 
-pkg_check_modules(MINIZIP minizip>=2.0.0)
+pkg_check_modules(MINIZIP minizip-ng>=3.0.0)
 if(MINIZIP_FOUND)
   message(STATUS "Using shared minizip")
   include_directories(${MINIZIP_INCLUDE_DIRS})
diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt
index 4068cd85bc..c3d7c5512e 100644
--- a/Externals/minizip/CMakeLists.txt
+++ b/Externals/minizip/CMakeLists.txt
@@ -67,4 +67,4 @@ endif()
 
 target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
 
-add_library(MiniZip::minizip ALIAS minizip)
+add_library(minizip-ng ALIAS minizip)
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 52448c9ea9..729d62c441 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -140,7 +140,7 @@ PUBLIC
   enet
   fmt::fmt
   ${MBEDTLS_LIBRARIES}
-  minizip
+  minizip-ng
 
 PRIVATE
   ${CURL_LIBRARIES}
diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h
index d06b3f4f5d..6057632ddd 100644
--- a/Source/Core/Common/MinizipUtil.h
+++ b/Source/Core/Common/MinizipUtil.h
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include <unzip.h>
+#include <mz_compat.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/ScopeGuard.h"
diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
index 68028dbcfc..ec1562325a 100644
--- a/Source/Core/DiscIO/CMakeLists.txt
+++ b/Source/Core/DiscIO/CMakeLists.txt
@@ -73,7 +73,7 @@ PUBLIC
 
 PRIVATE
   fmt::fmt
-  minizip
+  minizip-ng
   pugixml
   ZLIB::ZLIB
 )
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
index 05070e3878..84ab51ef13 100644
--- a/Source/Core/DiscIO/VolumeVerifier.cpp
+++ b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -14,8 +14,8 @@
 
 #include <mbedtls/md5.h>
 #include <mbedtls/sha1.h>
+#include <mz_compat.h>
 #include <pugixml.hpp>
-#include <unzip.h>
 
 #include "Common/Align.h"
 #include "Common/Assert.h"
diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
index 2b7d5bd2a6..f2ffbd0821 100644
--- a/Source/Core/UICommon/CMakeLists.txt
+++ b/Source/Core/UICommon/CMakeLists.txt
@@ -31,7 +31,7 @@ target_link_libraries(uicommon
 PUBLIC
   common
   cpp-optparse
-  minizip
+  minizip-ng
   pugixml
 
 PRIVATE
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 98f0cd2e2d..585559029d 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include <unzip.h>
+#include <mz_compat.h>
 
 #include "Common/CommonPaths.h"
 #include "Common/FileSearch.h"