minizip, bump version (#9839)

This commit is contained in:
Schrijvers Luc
2023-12-06 16:00:32 +01:00
committed by GitHub
parent 9140c6b199
commit 1e1f2cc7ae
2 changed files with 2 additions and 64 deletions

View File

@@ -6,11 +6,10 @@ the features of the zip program."
HOMEPAGE="http://www.zlib.net/"
COPYRIGHT="1998-2010 Gilles Vollant and Mathias Svensson"
LICENSE="Zlib"
REVISION="3"
REVISION="1"
SOURCE_URI="http://zlib.net/fossils/zlib-$portVersion.tar.gz"
CHECKSUM_SHA256="b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
CHECKSUM_SHA256="ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e"
SOURCE_DIR="zlib-$portVersion"
PATCHES="minizip-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,61 +0,0 @@
From 59e528634b46240167fb935339f6fec03d70eb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 24 Aug 2017 22:34:32 +0200
Subject: Platform fix
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 814a6fd..04ad9cf 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -14,7 +14,7 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__)
// 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)
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index ae9ca7e..548dafb 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -50,7 +50,7 @@
#define ftello64 ftell
#define fseeko64 fseek
#else
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
#define fopen64 fopen
#define ftello64 ftello
#define fseeko64 fseeko
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 0dc9b50..f776d22 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -27,7 +27,7 @@
#endif
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__HAIKU__)
// 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)
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index e8561b1..65aca64 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -28,7 +28,7 @@
#endif
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__HAIKU__)
// 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)
--
2.37.3