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

BillyONeal · web-flow · commit 64f3d3d6201d · 2025-03-27T00:27:15.000-07:00
diff --git 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
diff --git 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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd",
+      "version-semver": "1.2.4",
+      "port-version": 3
+    },
     {
       "git-tree": "d769c90ee7605abee43e4ecfe4a933e12f90c740",
       "version-semver": "1.2.4",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "robotraconteur",`
`3`	`3`	`"version-semver": "1.2.4",`
`4`		`- "port-version": 2,`
	`4`	`+ "port-version": 3,`
`5`	`5`	`"description": "The Robot Raconteur communication framework core library",`
`6`	`6`	`"homepage": "https://www.robotraconteur.com",`
`7`	`7`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "8bbdcf710e57bd4b6dba3a9c776ff7b3ba7a18dd",`
	`5`	`+ "version-semver": "1.2.4",`
	`6`	`+ "port-version": 3`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "d769c90ee7605abee43e4ecfe4a933e12f90c740",`
`5`	`10`	`"version-semver": "1.2.4",`