[zlib] update to 1.3 (microsoft#33310)

* [zlib] update to 1.3 * v db * update minizip * v db * remove invalid patch * v db --------- Co-authored-by: Cheney-Wang <[email protected]>
Cheney-W · Aug 24, 2023 · 4a8d118 · 4a8d118
1 parent 0a29d2f
commit 4a8d118
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 60 deletions.
diff --git a/ports/minizip/0003-no-io64.patch b/ports/minizip/0003-no-io64.patch
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake
@@ -2,13 +2,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO madler/zlib
-    REF v1.2.13
-    SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659
+    REF v${VERSION}
+    SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9
     HEAD_REF master
     PATCHES
         0001-remove-ifndef-NOUNCRYPT.patch
         0002-add-declaration-for-mkdir.patch
-        0003-no-io64.patch
         pkgconfig.patch
 )
 

diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "minizip",
-  "version-semver": "1.2.13",
-  "port-version": 3,
+  "version": "1.3",
   "description": "Minizip zip file manipulation library",
   "homepage": "https://github.com/madler/zlib",
   "license": "Zlib",

diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO madler/zlib
-    REF v1.2.13
-    SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659
+    REF v${VERSION}
+    SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9
     HEAD_REF master
     PATCHES
         0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch
@@ -49,5 +49,7 @@ else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1")
 endif()
 
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zlib.h" "#define ZLIB_VERSION \"1.3\"" "#define ZLIB_VERSION \"1.3.0\"")
+
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "zlib",
-  "version": "1.2.13",
+  "version": "1.3",
   "description": "A compression library",
   "homepage": "https://www.zlib.net/",
   "license": "Zlib",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5397,8 +5397,8 @@
       "port-version": 0
     },
     "minizip": {
-      "baseline": "1.2.13",
-      "port-version": 3
+      "baseline": "1.3",
+      "port-version": 0
     },
     "minizip-ng": {
       "baseline": "4.0.0",
@@ -9065,7 +9065,7 @@
       "port-version": 3
     },
     "zlib": {
-      "baseline": "1.2.13",
+      "baseline": "1.3",
       "port-version": 0
     },
     "zlib-ng": {

diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2295a5b26e2cbbbf59706f08dc1c5717da951bd1",
+      "version": "1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2",
       "version-semver": "1.2.13",

diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ac18c6e6e3e2bf5a9e3d0bc8a845f198e4c4e05",
+      "version": "1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "ad5a49006f73b45b715299515f31164131b51982",
       "version": "1.2.13",