mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
4cbbcbddfd
* [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
30 lines
671 B
Diff
30 lines
671 B
Diff
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)
|
|
|