From 4e095771ae8c99ad9f8df7e061990b8cd4eb943d Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:10:37 -0700 Subject: [PATCH] [rhash] update to 1.4.2 (#24369) * [rhash] update to 1.4.2 * update version * remove unused method * overwrite-version --- ports/rhash/portfile.cmake | 17 ++++++++--------- ports/rhash/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/r-/rhash.json | 5 +++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index d80f7fce64..8c18f5b592 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -1,22 +1,21 @@ -set(RHASH_XVERSION 1.4.0) +set(RHASH_XVERSION 1.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF df0c969966b5da10f2db5060cf329790db95080e # v1.4.0 - SHA512 eebd5872f5d40d5ef5b7fe857ff3099c3b60e37cedaacf7ae8da63bd18790a16546de1809fa9f8e4fa7eef178121051b267fedd5d237135b80201f8609d613b6 + REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2 + SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/librhash") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/librhash - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/librhash" OPTIONS_DEBUG -DRHASH_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rhash/vcpkg.json b/ports/rhash/vcpkg.json index 252e0b0cf7..47cfe74d7d 100644 --- a/ports/rhash/vcpkg.json +++ b/ports/rhash/vcpkg.json @@ -1,8 +1,14 @@ { "name": "rhash", - "version": "1.4.0", - "port-version": 2, + "version": "1.4.2", "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", - "supports": "!uwp" + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index cbddc5cb9d..c48d4cf06f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6185,8 +6185,8 @@ "port-version": 0 }, "rhash": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 0 }, "rhasheq": { "baseline": "0.0.1", diff --git a/versions/r-/rhash.json b/versions/r-/rhash.json index 5645f74581..02940d0345 100644 --- a/versions/r-/rhash.json +++ b/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "385025c1a8f84dfaf6035c2d730fb4ae0d8b16fd", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", "version": "1.4.0",