From 9e4b14bfabaa4076ea96ffd8cf5e5f0fa691239a Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Wed, 6 Sep 2023 22:02:46 +0200
Subject: [PATCH] [minizip-ng] fix pkgconfig file (#33568)

---
 ports/minizip-ng/fix-pkgconfig.patch | 43 ++++++++++++++++++++++++++++
 ports/minizip-ng/portfile.cmake      |  1 +
 ports/minizip-ng/vcpkg.json          |  2 +-
 versions/baseline.json               |  2 +-
 versions/m-/minizip-ng.json          |  5 ++++
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 ports/minizip-ng/fix-pkgconfig.patch

diff --git a/ports/minizip-ng/fix-pkgconfig.patch b/ports/minizip-ng/fix-pkgconfig.patch
new file mode 100644
index 0000000000..08d0bbc03d
--- /dev/null
+++ b/ports/minizip-ng/fix-pkgconfig.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ca7729e..9af0a7ad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,6 +128,7 @@ set(MINIZIP_HDR
+     mz_zip_rw.h)
+ 
+ set(PC_PRIVATE_LIBS)
++set(PC_PRIVATE_DEPS)
+ 
+ # Check for system includes
+ check_include_file(stdint.h   HAVE_STDINT_H)
+@@ -184,7 +185,7 @@ if(MZ_ZLIB)
+         list(APPEND MINIZIP_LIB ${ZLIBNG_LIBRARIES})
+         list(APPEND MINIZIP_LBD ${ZLIBNG_LIBRARY_DIRS})
+ 
+-        set(PC_PRIVATE_LIBS " -lz-ng")
++        set(PC_PRIVATE_DEPS "zlib-ng")
+         set(ZLIB_COMPAT OFF)
+     elseif(ZLIB_FOUND AND NOT MZ_FORCE_FETCH_LIBS)
+         message(STATUS "Using ZLIB ${ZLIB_VERSION}")
+@@ -193,7 +194,7 @@ if(MZ_ZLIB)
+         list(APPEND MINIZIP_LIB ${ZLIB_LIBRARIES})
+         list(APPEND MINIZIP_LBD ${ZLIB_LIBRARY_DIRS})
+ 
+-        set(PC_PRIVATE_LIBS " -lz")
++        set(PC_PRIVATE_DEPS "zlib")
+         set(ZLIB_COMPAT ON)
+     elseif(MZ_FETCH_LIBS)
+         clone_repo(zlib https://github.com/madler/zlib)
+diff --git a/minizip.pc.cmakein b/minizip.pc.cmakein
+index d8a0dd72..7aecd852 100644
+--- a/minizip.pc.cmakein
++++ b/minizip.pc.cmakein
+@@ -8,7 +8,7 @@ Name: @MINIZIP_TARGET@
+ Description: Zip manipulation library
+ Version: @VERSION@
+ 
+-Requires: zlib
++Requires.private: @PC_PRIVATE_DEPS@
+ Libs: -L${libdir} -L${sharedlibdir} -l@MINIZIP_TARGET@
+ Libs.private:@PC_PRIVATE_LIBS@
+ Cflags: -I${includedir}
diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake
index d229e8220c..4229529c07 100644
--- a/ports/minizip-ng/portfile.cmake
+++ b/ports/minizip-ng/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_find_zstd.patch
+        fix-pkgconfig.patch
 )
 
 vcpkg_check_features(
diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json
index f6d1177652..9ec1b4fe7d 100644
--- a/ports/minizip-ng/vcpkg.json
+++ b/ports/minizip-ng/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "minizip-ng",
   "version": "4.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.",
   "homepage": "https://github.com/zlib-ng/minizip-ng",
   "license": "Zlib",
diff --git a/versions/baseline.json b/versions/baseline.json
index b8767f8c3b..f1343b0efb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5402,7 +5402,7 @@
     },
     "minizip-ng": {
       "baseline": "4.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "mio": {
       "baseline": "2023-03-03",
diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json
index c8d3d79d2b..008e44fdd9 100644
--- a/versions/m-/minizip-ng.json
+++ b/versions/m-/minizip-ng.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb59eb8b735f74193a79326e33fb6f9abc66846a",
+      "version": "4.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "1483ef1293bbd3eea5edd9b5051bb4457eebfa2e",
       "version": "4.0.0",