diff --git a/ports/robotraconteur/portfile.cmake b/ports/robotraconteur/portfile.cmake index 0026d6896865de..300d1a86bfddfa 100644 --- a/ports/robotraconteur/portfile.cmake +++ b/ports/robotraconteur/portfile.cmake @@ -2,6 +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 @@ -10,7 +16,7 @@ vcpkg_from_github( HEAD_REF master PATCHES rr_boost_1_87_patch.diff - remove-openssl-dependencies.patch + "${REMOVE_OPENSSL_DEPENDENCIES_PATCH}" ) vcpkg_cmake_configure( diff --git a/ports/robotraconteur/remove-openssl-dependencies.patch b/ports/robotraconteur/remove-openssl-dependencies.patch deleted file mode 100644 index 93f89c5fe2e7d5..00000000000000 --- a/ports/robotraconteur/remove-openssl-dependencies.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/RobotRaconteurCore/CMakeLists.txt b/RobotRaconteurCore/CMakeLists.txt -index fbef9b4..85054f5 100644 ---- a/RobotRaconteurCore/CMakeLists.txt -+++ b/RobotRaconteurCore/CMakeLists.txt -@@ -336,12 +336,12 @@ if(UNIX AND NOT APPLE AND NOT ANDROID) - - target_include_directories(RobotRaconteurCore PRIVATE ${DBUS_INCLUDE_DIR} ${DBUS_INCLUDE_ARCH_DIR} - ${LIBUSB_INCLUDE_DIR}) -- target_link_libraries(RobotRaconteurCore PRIVATE OpenSSL::SSL OpenSSL::Crypto pthread rt z dl) -+ target_link_libraries(RobotRaconteurCore PRIVATE OpenSSL::SSL OpenSSL::Crypto) - target_compile_definitions(RobotRaconteurCore PRIVATE ROBOTRACONTEUR_USE_OPENSSL) - else() - target_include_directories(RobotRaconteurCore PRIVATE ${DBUS_INCLUDE_DIR} ${DBUS_INCLUDE_ARCH_DIR} - ${LIBUSB_INCLUDE_DIR}) -- target_link_libraries(RobotRaconteurCore PUBLIC OpenSSL::SSL OpenSSL::Crypto pthread rt z dl) -+ target_link_libraries(RobotRaconteurCore PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_compile_definitions(RobotRaconteurCore PUBLIC ROBOTRACONTEUR_USE_OPENSSL) - endif() - diff --git a/ports/robotraconteur/vcpkg.json b/ports/robotraconteur/vcpkg.json index 0be2100ce027ed..5f07a01d9b52b1 100644 --- a/ports/robotraconteur/vcpkg.json +++ b/ports/robotraconteur/vcpkg.json @@ -1,7 +1,7 @@ { "name": "robotraconteur", "version-semver": "1.2.4", - "port-version": 2, + "port-version": 3, "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 bcebb383eb4286..b53486b2a8ae67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8154,7 +8154,7 @@ }, "robotraconteur": { "baseline": "1.2.4", - "port-version": 2 + "port-version": 3 }, "robotraconteur-companion": { "baseline": "0.4.1", diff --git a/versions/r-/robotraconteur.json b/versions/r-/robotraconteur.json index 322db7aa84b32b..65983ff502d1bc 100644 --- a/versions/r-/robotraconteur.json +++ b/versions/r-/robotraconteur.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd", + "version-semver": "1.2.4", + "port-version": 3 + }, { "git-tree": "d769c90ee7605abee43e4ecfe4a933e12f90c740", "version-semver": "1.2.4",