From 9e78043c57b6aa751753a3cebc4d7aeff8ac84f8 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 23 Aug 2024 03:03:58 -0700 Subject: [PATCH] [miniupnpc] Update to 2.3.7 (#40552) Co-authored-by: Monica --- ports/miniupnpc/portfile.cmake | 14 +++++--------- ports/miniupnpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/miniupnpc.json | 5 +++++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake index a61b52fa2f..78d66aebb9 100644 --- a/ports/miniupnpc/portfile.cmake +++ b/ports/miniupnpc/portfile.cmake @@ -2,8 +2,8 @@ string(REPLACE "." "_" MINIUPNPC_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO miniupnp/miniupnp - REF "miniupnpc_${MINIUPNPC_VERSION}" - SHA512 2f1fcd2d2820f649b832e1e0d6b826a812ee84f634460acb3b4af15338488fe3889bb8929c38a91a4f9786a5232177df479d874a388230723d27ae708d3b2592 + REF "miniupnpd_${MINIUPNPC_VERSION}" + SHA512 f461b57446d9086e8fc2caf6ef202a78d204b2580d6096aca63234fda53302cad03840b14cc0d8b68e9033049b749be46e35c3737cc6cbcd2ad30c59b737a390 HEAD_REF master ) @@ -30,13 +30,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") else() - file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file( - INSTALL ${RELEASE_TOOLS} - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" - ) - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS}) + if(${RELEASE_TOOLS}) + vcpkg_copy_tools(TOOL_NAMES ${RELEASE_TOOLS} AUTO_CLEAN) + endif() endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json index d01b0cd34d..568a768dd0 100644 --- a/ports/miniupnpc/vcpkg.json +++ b/ports/miniupnpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "miniupnpc", - "version": "2.2.6", + "version": "2.3.7", "description": "UPnP client library/tool to access Internet Gateway Devices", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fdfbb7dd50..d0459045a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5861,7 +5861,7 @@ "port-version": 0 }, "miniupnpc": { - "baseline": "2.2.6", + "baseline": "2.3.7", "port-version": 0 }, "miniz": { diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index 243b5f57c0..7c7f707f38 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cd06d47cb0cbaf659be8195bf06f2aef1980746", + "version": "2.3.7", + "port-version": 0 + }, { "git-tree": "9aee8de3ea87943bfaeff5368a5ae5194bf6b7fc", "version": "2.2.6",