Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[robotraconteur] Use upstream's patch. (#44634)

This commit is contained in:
Billy O'Neal 2025-03-27 00:27:15 -07:00 committed by GitHub
parent fcf21f80ed
commit 64f3d3d620
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/robotraconteur/portfile.cmake
View File

@ -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(

19
ports/robotraconteur/remove-openssl-dependencies.patch
View File

@ -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()

2
ports/robotraconteur/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -8154,7 +8154,7 @@
},
"robotraconteur": {
"baseline": "1.2.4",
"port-version": 2
"port-version": 3
},
"robotraconteur-companion": {
"baseline": "0.4.1",

5
versions/r-/robotraconteur.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd",
"version-semver": "1.2.4",
"port-version": 3
},
{
"git-tree": "d769c90ee7605abee43e4ecfe4a933e12f90c740",
"version-semver": "1.2.4",