From 8bbffa13236d00099c64bc3007da4ab86200d181 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 29 Aug 2023 15:17:08 +0800 Subject: [PATCH] update to 3.1.10 (#33420) --- ports/libmodbus/portfile.cmake | 6 +++--- ports/libmodbus/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libmodbus.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake index 59487c1ebe..3e16315905 100644 --- a/ports/libmodbus/portfile.cmake +++ b/ports/libmodbus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephane/libmodbus - REF v3.1.6 - SHA512 9eaa395c75e1170e703e01f8c52c6e6e87efe4eaa22adfc3b51153fd5535d545aea35cf68e1aba29720a6c1dd13d9c60b6b08a5c8098dccd13ccfdc6944420a9 + REF "v${VERSION}" + SHA512 6a01da1f8b486e356ff44874f1479d9d121463958a5ed06e60d910328ccc9b2d431b4a1fd72861c5c645c97b5887a076b763ad6a9ae6b18402dd043ec525b1e2 HEAD_REF master PATCHES fix-static-linkage.patch ) @@ -26,6 +26,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libmodbus/vcpkg.json b/ports/libmodbus/vcpkg.json index 34778e6160..1f383188a3 100644 --- a/ports/libmodbus/vcpkg.json +++ b/ports/libmodbus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmodbus", - "version": "3.1.6", - "port-version": 5, + "version": "3.1.10", "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", "homepage": "https://github.com/stephane/libmodbus", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 9e4186ff39..de87017c98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4345,8 +4345,8 @@ "port-version": 12 }, "libmodbus": { - "baseline": "3.1.6", - "port-version": 5 + "baseline": "3.1.10", + "port-version": 0 }, "libmodman": { "baseline": "2.0.1", diff --git a/versions/l-/libmodbus.json b/versions/l-/libmodbus.json index 30f4d8df12..8f80b0bcc6 100644 --- a/versions/l-/libmodbus.json +++ b/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5af2a746eeb644d4c228d03f4bb7854cf4f5691b", + "version": "3.1.10", + "port-version": 0 + }, { "git-tree": "803427a42499df9013b9e6a4dc3501384fc69760", "version": "3.1.6",