aboutsummaryrefslogtreecommitdiff
path: root/ports/minizip
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-09-24 15:15:06 -0700
committerGitHub <noreply@github.com>2020-09-24 15:15:06 -0700
commit4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch)
tree371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/minizip
parentc1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff)
downloadvcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.tar.gz
vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.zip
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install * add instructions for creating a new vagrant box * fix the vagrant scripts for the new box * finish fixing the setup * [mecab jxrlib] fix ports for CI mecab needed to use an actual ref that wasn't master, and jxrlib needed a patch for xcode 12 CLTs. Additionally, this fixes the mecab version to be a date, the date of the last commit, since `1.0` is not the correct version (mecab doesn't have released versions) * [many ports] fix compile with Xcode 12 CLTs This mostly means fixing errors on implicit-function-declaration, and removing some Werrors * alac-decoder * apr * argtable2 * arrow * hyperscan * mcpp * minizip * mosquitto * stormlib * [many ports] even more Xcode 12 CLT fixes * [jxrlib darknet] fix the last ports! (hopefully) * CRs, plus minor wip changes to osx scripts
Diffstat (limited to 'ports/minizip')
-rw-r--r--ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch29
-rw-r--r--ports/minizip/0002-add-declaration-for-mkdir.patch29
-rw-r--r--ports/minizip/CONTROL3
-rw-r--r--ports/minizip/minizip.patch16
-rw-r--r--ports/minizip/portfile.cmake18
5 files changed, 70 insertions, 25 deletions
diff --git a/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch b/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch
new file mode 100644
index 000000000..d9c051d28
--- /dev/null
+++ b/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch
@@ -0,0 +1,29 @@
+From a6fd3992d44053a523a67aa16f5ae88fecfb20e1 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Tue, 22 Sep 2020 14:09:53 -0700
+Subject: [PATCH 1/2] remove `#ifndef NOUNCRYPT`
+
+enable decrypt support for password-encrypted ZIP files
+
+---
+ contrib/minizip/unzip.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
+index bcfb941..1895a0f 100644
+--- a/contrib/minizip/unzip.c
++++ b/contrib/minizip/unzip.c
+@@ -68,10 +68,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#ifndef NOUNCRYPT
+- #define NOUNCRYPT
+-#endif
+-
+ #include "zlib.h"
+ #include "unzip.h"
+
+--
+2.24.3 (Apple Git-128)
+
diff --git a/ports/minizip/0002-add-declaration-for-mkdir.patch b/ports/minizip/0002-add-declaration-for-mkdir.patch
new file mode 100644
index 000000000..8786a840b
--- /dev/null
+++ b/ports/minizip/0002-add-declaration-for-mkdir.patch
@@ -0,0 +1,29 @@
+From 6c38b6f544b55f9fc554f0fe22e2cbaddfaed7f8 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Tue, 22 Sep 2020 14:15:04 -0700
+Subject: [PATCH 2/2] add declaration for mkdir
+
+It's invalid in C99 to implicitly declare mkdir
+
+---
+ contrib/minizip/miniunz.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
+index 3d65401..5341af2 100644
+--- a/contrib/minizip/miniunz.c
++++ b/contrib/minizip/miniunz.c
+@@ -12,6 +12,10 @@
+ Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+ */
+
++#if !defined(_WIN32)
++#include <sys/stat.h>
++#endif
++
+ #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+ #ifndef __USE_FILE_OFFSET64
+ #define __USE_FILE_OFFSET64
+--
+2.24.3 (Apple Git-128)
+
diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL
index 415a3a82c..d4fafd4fd 100644
--- a/ports/minizip/CONTROL
+++ b/ports/minizip/CONTROL
@@ -1,5 +1,6 @@
Source: minizip
-Version: 1.2.11-6
+Version: 1.2.11
+Port-Version: 7
Build-Depends: zlib
Homepage: https://github.com/madler/zlib
Description: Zip compression library
diff --git a/ports/minizip/minizip.patch b/ports/minizip/minizip.patch
deleted file mode 100644
index 04ef8fa2f..000000000
--- a/ports/minizip/minizip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
-index f12e3329..bfc05f77 100644
---- a/contrib/minizip/unzip.c
-+++ b/contrib/minizip/unzip.c
-@@ -68,10 +68,6 @@
- #include <stdlib.h>
- #include <string.h>
-
--#ifndef NOUNCRYPT
-- #define NOUNCRYPT
--#endif
--
- #include "zlib.h"
- #include "unzip.h"
-
-
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake
index c1df89ac8..b70f26d9e 100644
--- a/ports/minizip/portfile.cmake
+++ b/ports/minizip/portfile.cmake
@@ -7,7 +7,9 @@ vcpkg_from_github(
REF v1.2.11
SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf
HEAD_REF master
- PATCHES minizip.patch # enable decrypt support for password-encrypted ZIP files
+ PATCHES
+ 0001-remove-ifndef-NOUNCRYPT.patch
+ 0002-add-declaration-for-mkdir.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -18,13 +20,13 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in ${SOURCE_PATH}/
configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS
- ${FEATURE_OPTIONS}
- OPTIONS_DEBUG
- -DDISABLE_INSTALL_HEADERS=ON
- -DDISABLE_INSTALL_TOOLS=ON
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ ${FEATURE_OPTIONS}
+ OPTIONS_DEBUG
+ -DDISABLE_INSTALL_HEADERS=ON
+ -DDISABLE_INSTALL_TOOLS=ON
)
vcpkg_install_cmake()