diff --git a/src/zziplib-1-fix-mmap.patch b/src/zziplib-1-fix-mmap.patch deleted file mode 100644 index d2a4125a..00000000 --- a/src/zziplib-1-fix-mmap.patch +++ /dev/null @@ -1,36 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&aid=2995373&group_id=6389&atid=306389 - ---- zziplib-0.13.59/zzip/__mmap.h 2013-10-03 22:23:32.467619238 -0400 -+++ zzip-patched/zzip/__mmap.h 2013-10-04 21:44:16.412881609 -0400 -@@ -63,14 +63,15 @@ - return 0; - { - HANDLE hFile = (HANDLE)_get_osfhandle(fd); -+ HANDLE fileMapping = NULL; - if (hFile) -- *user = (int) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); -- if (*user) -+ fileMapping = CreateFileMapping(hFile, 0, PAGE_READONLY, 0, 0, NULL); -+ if (fileMapping != NULL) - { - char* p = 0; -- p = MapViewOfFile(*(HANDLE*)user, FILE_MAP_READ, 0, offs, len); -- if (p) return p + offs; -- CloseHandle (*(HANDLE*)user); *user = 1; -+ p = MapViewOfFile(fileMapping, FILE_MAP_READ, 0, offs, len); -+ CloseHandle (fileMapping); -+ if (p) return p; - } - return MAP_FAILED; - } -@@ -78,7 +79,6 @@ - static void win32_munmap (long* user, char* fd_map, size_t len) - { - UnmapViewOfFile (fd_map); -- CloseHandle (*(HANDLE*)user); *user = 1; - } - - #define _zzip_mmap(user, fd, offs, len) \ diff --git a/src/zziplib-1-fix-strndup.patch b/src/zziplib-1-fix-strndup.patch new file mode 100644 index 00000000..aaf96b86 --- /dev/null +++ b/src/zziplib-1-fix-strndup.patch @@ -0,0 +1,31 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Hopper262 +Date: Sat, 23 Mar 2019 23:08:00 -0400 +Subject: [PATCH 1/1] Port ab78bba from gdraheim/zziplib + + +diff --git a/zzip/__string.h b/zzip/__string.h +index 1111111..2222222 100644 +--- a/zzip/__string.h ++++ b/zzip/__string.h +@@ -31,6 +31,7 @@ _zzip_strnlen(const char *p, size_t maxlen) + #if defined ZZIP_HAVE_STRNDUP || defined strndup + #define _zzip_strndup strndup + #else ++#include + + /* if your system does not have strndup: */ + zzip__new__ static char * +@@ -42,7 +43,7 @@ _zzip_strndup(char const *p, size_t maxlen) + } else + { + size_t len = _zzip_strnlen(p, maxlen); +- char* r = malloc(len + 1); ++ char* r = (char *)malloc(len + 1); + if (r == NULL) + return NULL; /* errno = ENOMEM */ + r[len] = '\0'; diff --git a/src/zziplib.mk b/src/zziplib.mk index 29e71536..b0d10c62 100644 --- a/src/zziplib.mk +++ b/src/zziplib.mk @@ -1,24 +1,14 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := zziplib -$(PKG)_WEBSITE := https://zziplib.sourceforge.io/ +$(PKG)_WEBSITE := https://github.com/gdraheim/zziplib $(PKG)_DESCR := ZZIPlib $(PKG)_IGNORE := -$(PKG)_VERSION := 0.13.62 -$(PKG)_CHECKSUM := a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 0.13.69 +$(PKG)_CHECKSUM := 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 +$(PKG)_GH_CONF := gdraheim/zziplib/tags,v $(PKG)_DEPS := cc zlib -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/p/zziplib/svn/HEAD/tree/tags/' | \ - $(SED) -n 's,.*.*,\1,p' | \ - tr '_' '.' | \ - $(SORT) -V | \ - tail -1 -endef - define $(PKG)_BUILD # don't build and install docs (echo '# DISABLED'; echo 'all:'; echo 'install:') > '$(1)/docs/Makefile.in'