From 4a8d11802f0a9ffbe5c68f6143d61d469d800a7d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 25 Aug 2023 01:38:15 +0200 Subject: [PATCH] [zlib] update to 1.3 (#33310) * [zlib] update to 1.3 * v db * update minizip * v db * remove invalid patch * v db --------- Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/minizip/0003-no-io64.patch | 49 -------------------------------- ports/minizip/portfile.cmake | 5 ++-- ports/minizip/vcpkg.json | 3 +- ports/zlib/portfile.cmake | 6 ++-- ports/zlib/vcpkg.json | 2 +- versions/baseline.json | 6 ++-- versions/m-/minizip.json | 5 ++++ versions/z-/zlib.json | 5 ++++ 8 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 ports/minizip/0003-no-io64.patch diff --git a/ports/minizip/0003-no-io64.patch b/ports/minizip/0003-no-io64.patch deleted file mode 100644 index 6e72e3c91412d2..00000000000000 --- a/ports/minizip/0003-no-io64.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c -index 7f5c191..d42e050 100644 ---- a/contrib/minizip/ioapi.c -+++ b/contrib/minizip/ioapi.c -@@ -17,8 +17,8 @@ - #if defined(__APPLE__) || defined(IOAPI_NO_64) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) --#define FTELLO_FUNC(stream) ftello(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #else - #define FOPEN_FUNC(filename, mode) fopen64(filename, mode) - #define FTELLO_FUNC(stream) ftello64(stream) -diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c -index 3d65401..a1269ea 100644 ---- a/contrib/minizip/miniunz.c -+++ b/contrib/minizip/miniunz.c -@@ -33,9 +33,9 @@ - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) - #else --#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) --#define FTELLO_FUNC(stream) ftello64(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) -+#define FOPEN_FUNC(filename, mode) fopen(filename, mode) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #endif - - -diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c -index 4288962..02267fb 100644 ---- a/contrib/minizip/minizip.c -+++ b/contrib/minizip/minizip.c -@@ -34,9 +34,9 @@ - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) - #else --#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) --#define FTELLO_FUNC(stream) ftello64(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) -+#define FOPEN_FUNC(filename, mode) fopen(filename, mode) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #endif - - diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 5b96bd71c9deda..9556565685203b 100644 --- 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 index ccb7b6cb1be85e..8c2d4b8040883e 100644 --- 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 index 450cb2c1915b25..1ec750bead8dd9 100644 --- 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 index 7ef1f29d8ed9e5..b4d578e45d056c 100644 --- 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 index 21573df606b72b..4866b8e0356663 100644 --- 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 index 5377d23ade0657..510fa328286fdf 100644 --- 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 index 9528646a6ed8d1..63e0ea6ed63642 100644 --- 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",