From ed7bb6e39882d804df2e920187f0e3074879fd87 Mon Sep 17 00:00:00 2001 From: John Wason Date: Mon, 20 Apr 2026 19:19:58 -0400 Subject: [PATCH] [robotraconteur-companion] Add patch to fix eigen3 5 version in cmake package config files (#51231) --- .../0001-support-eigen3-5.patch | 10 ++++++++++ ports/robotraconteur-companion/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/robotraconteur-companion.json | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/robotraconteur-companion/0001-support-eigen3-5.patch b/ports/robotraconteur-companion/0001-support-eigen3-5.patch index e0804cc379..0f857369f8 100644 --- a/ports/robotraconteur-companion/0001-support-eigen3-5.patch +++ b/ports/robotraconteur-companion/0001-support-eigen3-5.patch @@ -11,3 +11,13 @@ index 531f4c5..beff998 100644 find_package(OpenCV) if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/robdef/group1") +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index b4c8633..f626a78 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -9,4 +9,4 @@ set(RobotRaconteur_STANDARD_ROBDEF_FILES @RR_INSTALLED_ROBDEF@) + set(RobotRaconteur_STANDARD_ROBDEF_DIRS @RR_INSTALLED_ROBDEF_DIRS@) + + find_package(yaml-cpp REQUIRED) +-find_package(Eigen3 3.3 REQUIRED NO_MODULE) ++find_package(Eigen3 3.3...5 REQUIRED NO_MODULE) diff --git a/ports/robotraconteur-companion/vcpkg.json b/ports/robotraconteur-companion/vcpkg.json index 25a3ff3fb8..c07f8e6795 100644 --- a/ports/robotraconteur-companion/vcpkg.json +++ b/ports/robotraconteur-companion/vcpkg.json @@ -1,7 +1,7 @@ { "name": "robotraconteur-companion", "version-semver": "0.4.2", - "port-version": 1, + "port-version": 2, "homepage": "https://github.com/robotraconteur/robotraconteur_companion", "license": "Apache-2.0", "supports": "(windows & (x86 | x64)) | (linux & (x86 | x64 | arm64 | arm32)) | (osx & (x64 | arm64))", diff --git a/versions/baseline.json b/versions/baseline.json index a2aa247c49..688d277d53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8818,7 +8818,7 @@ }, "robotraconteur-companion": { "baseline": "0.4.2", - "port-version": 1 + "port-version": 2 }, "rocksdb": { "baseline": "11.0.4", diff --git a/versions/r-/robotraconteur-companion.json b/versions/r-/robotraconteur-companion.json index cf58c0aca4..c5255f4260 100644 --- a/versions/r-/robotraconteur-companion.json +++ b/versions/r-/robotraconteur-companion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36d4a083ef6a48e6614788bf7b89df770596faff", + "version-semver": "0.4.2", + "port-version": 2 + }, { "git-tree": "d96b2913b98c2b0c267078e21cd9e99d93ac3734", "version-semver": "0.4.2",