From 0a2f0928f8b8010c7aaf9030cc9d1c1823f00e4a Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 15 Nov 2026 14:18:08 +1000 Subject: [PATCH 1/2] Map the wxwidgets and wx-common rosdep keys to wxwidgets, not wxpython They are the C++ wxWidgets keys (libwxgtk*-dev, wx-common in Debian). mrpt_gui, the only package using them, links libwx_*; with wxpython in its host requirements it conflicted with pyqt6 over sip. Its wxwidgets override is no longer needed. Rebuild it in all four distributions. Co-Authored-By: Claude Opus 5.5 --- distros/humble/pkg_additional_info.yaml | 2 ++ distros/jazzy/pkg_additional_info.yaml | 2 ++ distros/lyrical/pkg_additional_info.yaml | 2 ++ distros/rolling/pkg_additional_info.yaml | 2 ++ shared/patch/dependencies.yaml | 4 +--- shared/robostack.yaml | 4 ++-- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/distros/humble/pkg_additional_info.yaml b/distros/humble/pkg_additional_info.yaml index bcc19fc13..9005c7193 100644 --- a/distros/humble/pkg_additional_info.yaml +++ b/distros/humble/pkg_additional_info.yaml @@ -111,6 +111,8 @@ ament_cmake_gtest: # uses conda-forge's gtest instead of gtest_vendor's sources build_number: 23 aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 23 +mrpt_gui: + build_number: 24 rtabmap_slam: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 23 spatio_temporal_voxel_layer: diff --git a/distros/jazzy/pkg_additional_info.yaml b/distros/jazzy/pkg_additional_info.yaml index 129677d46..20b101a58 100644 --- a/distros/jazzy/pkg_additional_info.yaml +++ b/distros/jazzy/pkg_additional_info.yaml @@ -145,6 +145,8 @@ moveit_ros_visualization: build_number: 28 moveit_task_constructor_visualization: build_number: 28 +mrpt_gui: + build_number: 30 nav2_rviz_plugins: build_number: 28 octomap_rviz_plugins: diff --git a/distros/lyrical/pkg_additional_info.yaml b/distros/lyrical/pkg_additional_info.yaml index 5266ede76..bd035c922 100644 --- a/distros/lyrical/pkg_additional_info.yaml +++ b/distros/lyrical/pkg_additional_info.yaml @@ -131,6 +131,8 @@ moveit_ros_visualization: build_number: 31 moveit_task_constructor_visualization: build_number: 31 +mrpt_gui: + build_number: 34 nav2_rviz_plugins: build_number: 31 rtabmap_rviz_plugins: diff --git a/distros/rolling/pkg_additional_info.yaml b/distros/rolling/pkg_additional_info.yaml index 8e3d8466e..3fd43aa58 100644 --- a/distros/rolling/pkg_additional_info.yaml +++ b/distros/rolling/pkg_additional_info.yaml @@ -79,6 +79,8 @@ moveit_ros_visualization: build_number: 33 moveit_task_constructor_visualization: build_number: 33 +mrpt_gui: + build_number: 35 rviz_2d_overlay_plugins: build_number: 33 rviz_common: diff --git a/shared/patch/dependencies.yaml b/shared/patch/dependencies.yaml index b2b946bd4..f35d43d3e 100644 --- a/shared/patch/dependencies.yaml +++ b/shared/patch/dependencies.yaml @@ -88,10 +88,8 @@ mrpt_common: # but package.xml (build_type cmake) does not declare it add_host: ["ros2-ament-cmake"] mrpt_gui: - # links libwx_*; the wxwidgets/wx-common keys map to wxpython, so wxwidgets is only a - # transitive host dep and its (weak) run_exports never reach the run requirements # Windows: nanogui links conda-forge's glad instead of its bundled copy (ros2-mrpt-gui.win.patch) - add_host: ["wxwidgets", "${{ 'glad' if win }}"] + add_host: ["${{ 'glad' if win }}"] mrpt_imgui: # Windows: links conda-forge's GLEW like mrpt_opengl, also for its users (ros2-mrpt-imgui.win.patch) add_host: ["${{ 'glew' if win }}"] diff --git a/shared/robostack.yaml b/shared/robostack.yaml index 3a1510ae2..f809e0a0b 100644 --- a/shared/robostack.yaml +++ b/shared/robostack.yaml @@ -1311,11 +1311,11 @@ virtualenv: wget: robostack: [wget] wx-common: - robostack: [wxpython] + robostack: [wxwidgets] wxpython: robostack: [wxpython] wxwidgets: - robostack: [wxpython] + robostack: [wxwidgets] x11-dev: robostack: linux: [xorg-libx11, libopengl-devel, libgl-devel] From 4ebe36c34165c018b482951393c7dd1a62e5a28c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 15 Nov 2026 15:12:40 +1000 Subject: [PATCH 2/2] humble, jazzy: pin wxwidgets to 3.3.1, the newest that works with Qt 5 on Linux wxwidgets 3.3.2+ (and the newest 3.3.1 builds) need gst-plugins-base 1.28, which no qt-main 5.15 accepts, so mrpt_gui's host requirements could not be solved on Linux. Co-Authored-By: Claude Opus 5.5 --- distros/humble/conda_build_config.yaml | 2 +- distros/humble/distro.yaml | 3 +++ distros/jazzy/conda_build_config.yaml | 2 +- distros/jazzy/distro.yaml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/distros/humble/conda_build_config.yaml b/distros/humble/conda_build_config.yaml index 5e074b26b..8dc1a8262 100644 --- a/distros/humble/conda_build_config.yaml +++ b/distros/humble/conda_build_config.yaml @@ -1176,7 +1176,7 @@ vtk_base: wcslib: - '8' wxwidgets: - - 3.3.3 + - 3.3.1 x264: - 1!164.* x265: diff --git a/distros/humble/distro.yaml b/distros/humble/distro.yaml index 8e021e640..f663ed152 100644 --- a/distros/humble/distro.yaml +++ b/distros/humble/distro.yaml @@ -6,6 +6,9 @@ channel_name: robostack-humble upload_to: [anaconda] read_from: anaconda pinning_overrides: + # wxwidgets >= 3.3.2 (and the newest 3.3.1 builds) need gst-plugins-base 1.28 on Linux, + # which no qt-main 5.15 accepts; mrpt_gui links both + wxwidgets: [3.3.1] # nav2_mppi_controller lists xsimd before xtensor: unpinned, the solver takes the newest # xsimd (14), which no xtensor >= 0.25 accepts, and falls back to xtensor 0.23.9, whose # xtensor_simd.hpp doesn't build with it. 0.25 brings a matching xsimd (as in jazzy). diff --git a/distros/jazzy/conda_build_config.yaml b/distros/jazzy/conda_build_config.yaml index 0adb66a71..1798717b5 100644 --- a/distros/jazzy/conda_build_config.yaml +++ b/distros/jazzy/conda_build_config.yaml @@ -1176,7 +1176,7 @@ vtk_base: wcslib: - '8' wxwidgets: - - 3.3.3 + - 3.3.1 x264: - 1!164.* x265: diff --git a/distros/jazzy/distro.yaml b/distros/jazzy/distro.yaml index ec8f5609c..dc5c919a5 100644 --- a/distros/jazzy/distro.yaml +++ b/distros/jazzy/distro.yaml @@ -6,6 +6,9 @@ channel_name: robostack-jazzy upload_to: [anaconda] read_from: anaconda pinning_overrides: + # wxwidgets >= 3.3.2 (and the newest 3.3.1 builds) need gst-plugins-base 1.28 on Linux, + # which no qt-main 5.15 accepts; mrpt_gui links both + wxwidgets: [3.3.1] # nav2_mppi_controller lists xsimd before xtensor: unpinned, the solver takes the newest # xsimd (14), which no xtensor >= 0.25 accepts, and falls back to xtensor 0.23.9, whose # xtensor_simd.hpp doesn't build with it. 0.25 brings a matching xsimd. (lyrical and