[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>
This commit is contained in:
Alexander Neumann 2023-08-25 01:38:15 +02:00 committed by GitHub
parent 0a29d2f8b0
commit 4a8d11802f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 60 deletions

View File

@ -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

View File

@ -2,13 +2,12 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO madler/zlib REPO madler/zlib
REF v1.2.13 REF v${VERSION}
SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0001-remove-ifndef-NOUNCRYPT.patch 0001-remove-ifndef-NOUNCRYPT.patch
0002-add-declaration-for-mkdir.patch 0002-add-declaration-for-mkdir.patch
0003-no-io64.patch
pkgconfig.patch pkgconfig.patch
) )

View File

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

View File

@ -2,8 +2,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO madler/zlib REPO madler/zlib
REF v1.2.13 REF v${VERSION}
SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch 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") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1")
endif() 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(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) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,6 +1,6 @@
{ {
"name": "zlib", "name": "zlib",
"version": "1.2.13", "version": "1.3",
"description": "A compression library", "description": "A compression library",
"homepage": "https://www.zlib.net/", "homepage": "https://www.zlib.net/",
"license": "Zlib", "license": "Zlib",

View File

@ -5397,8 +5397,8 @@
"port-version": 0 "port-version": 0
}, },
"minizip": { "minizip": {
"baseline": "1.2.13", "baseline": "1.3",
"port-version": 3 "port-version": 0
}, },
"minizip-ng": { "minizip-ng": {
"baseline": "4.0.0", "baseline": "4.0.0",
@ -9065,7 +9065,7 @@
"port-version": 3 "port-version": 3
}, },
"zlib": { "zlib": {
"baseline": "1.2.13", "baseline": "1.3",
"port-version": 0 "port-version": 0
}, },
"zlib-ng": { "zlib-ng": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2295a5b26e2cbbbf59706f08dc1c5717da951bd1",
"version": "1.3",
"port-version": 0
},
{ {
"git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2", "git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2",
"version-semver": "1.2.13", "version-semver": "1.2.13",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5ac18c6e6e3e2bf5a9e3d0bc8a845f198e4c4e05",
"version": "1.3",
"port-version": 0
},
{ {
"git-tree": "ad5a49006f73b45b715299515f31164131b51982", "git-tree": "ad5a49006f73b45b715299515f31164131b51982",
"version": "1.2.13", "version": "1.2.13",