From f5c547dae9ca2bfd20128e653bf39f6a56ab8d20 Mon Sep 17 00:00:00 2001 From: John Wason Date: Mon, 28 Jul 2025 22:50:37 -0400 Subject: [PATCH] [robotraconteur] Update to version 1.2.5 (#46634) --- ports/robotraconteur/portfile.cmake | 11 +- ports/robotraconteur/rr_boost_1_87_patch.diff | 136 ------------------ ports/robotraconteur/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/r-/robotraconteur.json | 5 + 5 files changed, 9 insertions(+), 150 deletions(-) delete mode 100644 ports/robotraconteur/rr_boost_1_87_patch.diff diff --git a/ports/robotraconteur/portfile.cmake b/ports/robotraconteur/portfile.cmake index 300d1a86bf..9afae8b69e 100644 --- a/ports/robotraconteur/portfile.cmake +++ b/ports/robotraconteur/portfile.cmake @@ -2,21 +2,12 @@ if(VCPKG_TARGET_IS_LINUX) MESSAGE(WARNING "${PORT} requires libbluetooth-dev from the system package manager.\nTry: 'sudo yum install libbluetooth-dev ' (or sudo apt-get install libbluetooth-dev)") endif() -vcpkg_download_distfile(REMOVE_OPENSSL_DEPENDENCIES_PATCH - URLS https://github.com/robotraconteur/robotraconteur/commit/0fe6efd8c448f68ae6c33c261b9df734b372ee47.patch?full_index=1 - FILENAME robotraconteur-openssl-dependencies-0fe6efd8c448f68ae6c33c261b9df734b372ee47.patch - SHA512 38769c15dfe98ee71f6cefd643f104d653cd38e1a590202d942e6a781bc5080f063b3e50e927089fa0aed85fe8345541fd7424ccf2f353e245a27f200b8cf024 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO robotraconteur/robotraconteur REF "v${VERSION}" - SHA512 d73621ff888ae8cfc9d6ac5a71b75920552948fb15ffe2fa13fb31a238fc92f6a271ea1653eed855ba04f371686dff6fdf46285f24a471a3147d7744563b4d0b + SHA512 4fe6111909e90554fd103085149989c15186f5d2769c2ec401c6e12d185a0db1160aed2b5cc8df2552fa14acaee83106f8ed161264a97bc8ebb1068d4b7d09c9 HEAD_REF master - PATCHES - rr_boost_1_87_patch.diff - "${REMOVE_OPENSSL_DEPENDENCIES_PATCH}" ) vcpkg_cmake_configure( diff --git a/ports/robotraconteur/rr_boost_1_87_patch.diff b/ports/robotraconteur/rr_boost_1_87_patch.diff deleted file mode 100644 index 98bc2ef546..0000000000 --- a/ports/robotraconteur/rr_boost_1_87_patch.diff +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/RobotRaconteurCore/src/HardwareTransport_libusb.cpp b/RobotRaconteurCore/src/HardwareTransport_libusb.cpp -index cd42753c..2012083f 100644 ---- a/RobotRaconteurCore/src/HardwareTransport_libusb.cpp -+++ b/RobotRaconteurCore/src/HardwareTransport_libusb.cpp -@@ -212,7 +212,7 @@ void LibUsb_Transfer_bulk::FillTransfer(uint8_t ep, boost::asio::mutable_buffer& - throw SystemResourceException("Memory error"); - this->data_buf = buf; - -- libusb_fill_bulk_transfer(transfer, device_handle.get(), ep, boost::asio::buffer_cast(buf), -+ libusb_fill_bulk_transfer(transfer, device_handle.get(), ep, RR_BOOST_ASIO_BUFFER_CAST(uint8_t*, buf), - boost::numeric_cast(boost::asio::buffer_size(buf)), - &LibUsbDeviceManager::transfer_complete, this, 0); - -diff --git a/RobotRaconteurCore/src/OpenSSLAuthContext.cpp b/RobotRaconteurCore/src/OpenSSLAuthContext.cpp -index ccdf08c0..fb3d7228 100644 ---- a/RobotRaconteurCore/src/OpenSSLAuthContext.cpp -+++ b/RobotRaconteurCore/src/OpenSSLAuthContext.cpp -@@ -60,7 +60,7 @@ struct x509_stack_cleanup - BIO* make_buffer_bio(const boost::asio::const_buffer& b) - { - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast) -- return ::BIO_new_mem_buf(const_cast(boost::asio::buffer_cast(b)), -+ return ::BIO_new_mem_buf(const_cast(RR_BOOST_ASIO_BUFFER_CAST(const void*, b)), - boost::numeric_cast(boost::asio::buffer_size(b))); - } - -diff --git a/RobotRaconteurCore/src/TcpTransport.cpp b/RobotRaconteurCore/src/TcpTransport.cpp -index 350495f6..c2b49ba0 100644 ---- a/RobotRaconteurCore/src/TcpTransport.cpp -+++ b/RobotRaconteurCore/src/TcpTransport.cpp -@@ -1713,7 +1713,11 @@ void TcpWSSWebSocketConnector::Connect2( - - context->set_verify_mode(boost::asio::ssl::verify_peer); - #ifndef ROBOTRACONTEUR_APPLE -+#if BOOST_ASIO_VERSION < 101601 - context->set_verify_callback(boost::asio::ssl::rfc2818_verification(servername)); -+#else -+ context->set_verify_callback(boost::asio::ssl::host_name_verification(servername)); -+#endif - #else - context->set_verify_callback(boost::bind(&TcpWSSWebSocketConnector::verify_callback, RR_BOOST_PLACEHOLDERS(_1), - RR_BOOST_PLACEHOLDERS(_2), servername)); -diff --git a/RobotRaconteurCore/src/websocket_stream.hpp b/RobotRaconteurCore/src/websocket_stream.hpp -index 458f5dd2..60cc0f77 100644 ---- a/RobotRaconteurCore/src/websocket_stream.hpp -+++ b/RobotRaconteurCore/src/websocket_stream.hpp -@@ -1740,6 +1740,14 @@ class websocket_stream : private boost::noncopyable - boost::range::copy(buffers, std::back_inserter(b)); - async_write_some(b, handler); - } -+ -+ template -+ void async_write_some(const boost::asio::const_buffer& buffer, BOOST_ASIO_MOVE_ARG(Handler) handler) -+ { -+ const_buffers b; -+ b.push_back(buffer); -+ async_write_some(b, handler); -+ } - }; - - class websocket_tcp_connector : public boost::enable_shared_from_this -diff --git a/RobotRaconteurGen/CMakeLists.txt b/RobotRaconteurGen/CMakeLists.txt -index afd0df87..fee9c0ab 100644 ---- a/RobotRaconteurGen/CMakeLists.txt -+++ b/RobotRaconteurGen/CMakeLists.txt -@@ -1,3 +1,31 @@ -+if(NOT EMSCRIPTEN) -+ set(Boost_USE_MULTITHREADED ON) -+ set(Boost_USE_STATIC_RUNTIME OFF CACHE BOOL "") -+ find_package( -+ Boost -+ COMPONENTS date_time -+ filesystem -+ system -+ regex -+ chrono -+ atomic -+ thread -+ random -+ program_options -+ REQUIRED) -+else() -+ find_package( -+ Boost -+ COMPONENTS date_time -+ filesystem -+ system -+ regex -+ chrono -+ random -+ program_options -+ REQUIRED) -+endif() -+ - set(RobotRaconteurGen_src - CPPServiceLangGen.cpp CSharpServiceLangGen.cpp - # VBNETServiceLangGen.cpp -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index e917ef37..f198102a 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,6 +2,34 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros.cmake) - - find_package(GTest) - -+if(NOT EMSCRIPTEN) -+ set(Boost_USE_MULTITHREADED ON) -+ set(Boost_USE_STATIC_RUNTIME OFF CACHE BOOL "") -+ find_package( -+ Boost -+ COMPONENTS date_time -+ filesystem -+ system -+ regex -+ chrono -+ atomic -+ thread -+ random -+ program_options -+ REQUIRED) -+else() -+ find_package( -+ Boost -+ COMPONENTS date_time -+ filesystem -+ system -+ regex -+ chrono -+ random -+ program_options -+ REQUIRED) -+endif() -+ - add_subdirectory(robdef) - add_subdirectory(lfsr) - diff --git a/ports/robotraconteur/vcpkg.json b/ports/robotraconteur/vcpkg.json index 5f07a01d9b..e528d842b5 100644 --- a/ports/robotraconteur/vcpkg.json +++ b/ports/robotraconteur/vcpkg.json @@ -1,7 +1,6 @@ { "name": "robotraconteur", - "version-semver": "1.2.4", - "port-version": 3, + "version-semver": "1.2.5", "description": "The Robot Raconteur communication framework core library", "homepage": "https://www.robotraconteur.com", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b441ea715c..518216857a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8409,8 +8409,8 @@ "port-version": 0 }, "robotraconteur": { - "baseline": "1.2.4", - "port-version": 3 + "baseline": "1.2.5", + "port-version": 0 }, "robotraconteur-companion": { "baseline": "0.4.1", diff --git a/versions/r-/robotraconteur.json b/versions/r-/robotraconteur.json index 65983ff502..b5765c7a3c 100644 --- a/versions/r-/robotraconteur.json +++ b/versions/r-/robotraconteur.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8cb39d1d73341aa5918bba2d4f17d5fe22a1215", + "version-semver": "1.2.5", + "port-version": 0 + }, { "git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd", "version-semver": "1.2.4",