From f68f30c1e1aebe53081d722e8add85cd85ef8f11 Mon Sep 17 00:00:00 2001 From: Prateek Chokse Date: Wed, 19 May 2021 04:16:03 +0530 Subject: [minizip-ng] made cmake installs relative (#17685) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [minizip-ng] made cmake installs relative * [minizip-ng] update version * Update versions/m-/minizip-ng.json * formated ports/minzip-ng/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/minizip-ng/Modify-header-file-path.patch | 10 +++++----- ports/minizip-ng/portfile.cmake | 7 ++++--- ports/minizip-ng/vcpkg.json | 3 +-- versions/baseline.json | 6 +++--- versions/m-/minizip-ng.json | 5 +++++ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ports/minizip-ng/Modify-header-file-path.patch b/ports/minizip-ng/Modify-header-file-path.patch index 54299bac0..ac1c6fee8 100644 --- a/ports/minizip-ng/Modify-header-file-path.patch +++ b/ports/minizip-ng/Modify-header-file-path.patch @@ -4,10 +4,10 @@ index 9ef8023..ec1ee55 100644 +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ include(FeatureSummary) - set(INSTALL_BIN_DIR ${CMAKE_INSTALL_FULL_BINDIR} CACHE PATH "Installation directory for executables") - set(INSTALL_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "Installation directory for libraries") --set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation directory for headers") -+set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers") - set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation directory for manual pages") + set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") + set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") +-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") ++set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers") + set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") set(STDLIB_DEF) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 6d6cd7168..69ccb97af 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng - REF 3.0.1 - SHA512 98c9bdcea79a88a2dd69cec6c49f8565edf78ab9cddbf0e85e08b049b300b187f176bf57d5a894bf777bec0a097e46ecc05f78dab9cd5726fd473ffd8718dce0 + REF 3.0.2 + SHA512 eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc HEAD_REF master - PATCHES Modify-header-file-path.patch + PATCHES + Modify-header-file-path.patch ) vcpkg_cmake_configure( diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index b40124581..33f77dd29 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minizip-ng", - "version": "3.0.1", - "port-version": 1, + "version": "3.0.2", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 43b0125e9..efb8bc9d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3993,8 +3993,8 @@ "port-version": 8 }, "minizip-ng": { - "baseline": "3.0.1", - "port-version": 1 + "baseline": "3.0.2", + "port-version": 0 }, "mio": { "baseline": "2019-02-10", @@ -6701,4 +6701,4 @@ "port-version": 1 } } -} +} \ No newline at end of file diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 880464914..7230ce31c 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c49a3f4d6bb3e5173cf17e1539b439dcf4bf6ea", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "c3f833fb14771ffd8f32496aa12035c86ab1cb9a", "version": "3.0.1", -- cgit v1.2.3