Skip to content

[robotraconteur] Use upstream's patch. #44634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Mar 27, 2025
+14 −22
Merged

[robotraconteur] Use upstream's patch. #44634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ports/robotraconteur/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
19 changes: 0 additions & 19 deletions ports/robotraconteur/remove-openssl-dependencies.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/robotraconteur/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8154,7 +8154,7 @@
},
"robotraconteur": {
"baseline": "1.2.4",
"port-version": 2
"port-version": 3
},
"robotraconteur-companion": {
"baseline": "0.4.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/robotraconteur.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd",
"version-semver": "1.2.4",
"port-version": 3
},
{
"git-tree": "d769c90ee7605abee43e4ecfe4a933e12f90c740",
"version-semver": "1.2.4",
Expand Down