diff options
| author | Michał Janiszewski <janisozaur@users.noreply.github.com> | 2018-03-09 10:41:40 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-09 01:41:40 -0800 |
| commit | d5ca6630393cd6fa2bd929672b1afd3a9bdd2728 (patch) | |
| tree | 609eb35a0ca88207e5335e995b87c5056f36bd14 | |
| parent | 965e99cf268b32cc32e0599d99e6c9a1991e95f4 (diff) | |
| download | vcpkg-d5ca6630393cd6fa2bd929672b1afd3a9bdd2728.tar.gz vcpkg-d5ca6630393cd6fa2bd929672b1afd3a9bdd2728.zip | |
[libzip] Update with latest patches (#2990)
| -rw-r--r-- | ports/libzip/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libzip/fix-attribute.patch | 12 | ||||
| -rw-r--r-- | ports/libzip/portfile.cmake | 5 |
3 files changed, 3 insertions, 16 deletions
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index 763275196..f827f4d71 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,4 +1,4 @@ Source: libzip -Version: 1.4.0 +Version: 1.4.0-1 Build-Depends: zlib Description: A library for reading, creating, and modifying zip archives. diff --git a/ports/libzip/fix-attribute.patch b/ports/libzip/fix-attribute.patch deleted file mode 100644 index 0669d75d6..000000000 --- a/ports/libzip/fix-attribute.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/zip_algorithm_bzip2.c b/lib/zip_algorithm_bzip2.c -index 1748fd4..fd74503 100644 ---- a/lib/zip_algorithm_bzip2.c -+++ b/lib/zip_algorithm_bzip2.c -@@ -270,6 +270,6 @@ zip_compression_algorithm_t zip_algorithm_bzip2_decompress = { - - #else - --static int dummy __attribute__((used)); -+static int dummy; - - #endif /* HAVE_LIBBZ2 */ diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index ae95a3ae4..5c1f02704 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip - REF rel-1-4-0 - SHA512 3d8c5e64c567d2b91670ea041228d74cc8415116dfeb5c9bcf587ab817618eace668c5171122eeccf2a5f25242c2439c5f60b361f99a06274ab58aea720fe0bb + REF ad1f02d3b2aac532a89cbf8fd21f55677789b82d + SHA512 b1ed427916ec555ead454d39a244502f64bbc8799c20394944797b878196f1b9a9dda64be218fe89bb1747c841d7b36e8e7fb7b0be1fbdf777f049cd823635d6 ) # Patch cmake and configuration to allow static builds @@ -11,7 +11,6 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/cmake_dont_build_more_than_needed.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-attribute.patch" ) vcpkg_configure_cmake( |