From a52bb3d89a50ad69e476da282f8509dc6b4fa731 Mon Sep 17 00:00:00 2001
From: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
Date: Thu, 26 Oct 2023 21:56:39 +0200
Subject: [PATCH 1/2] QTimer::setInterval expects int argument

Since Ubuntu 22.04 / Qt 5.15, Qt is pickier about the correct type.
---
 .../src/rqt_controller_manager/controller_manager.py        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rqt_controller_manager/src/rqt_controller_manager/controller_manager.py b/rqt_controller_manager/src/rqt_controller_manager/controller_manager.py
index f913d731c..97448f7a8 100644
--- a/rqt_controller_manager/src/rqt_controller_manager/controller_manager.py
+++ b/rqt_controller_manager/src/rqt_controller_manager/controller_manager.py
@@ -120,15 +120,13 @@ def __init__(self, context):
         # Timer for controller manager updates
         self._list_cm = ControllerManagerLister()
         self._update_cm_list_timer = QTimer(self)
-        self._update_cm_list_timer.setInterval(1000.0 /
-                                               self._cm_update_freq)
+        self._update_cm_list_timer.setInterval(int(1000.0 / self._cm_update_freq))
         self._update_cm_list_timer.timeout.connect(self._update_cm_list)
         self._update_cm_list_timer.start()
 
         # Timer for running controller updates
         self._update_ctrl_list_timer = QTimer(self)
-        self._update_ctrl_list_timer.setInterval(1000.0 /
-                                                 self._cm_update_freq)
+        self._update_ctrl_list_timer.setInterval(int(1000.0 / self._cm_update_freq))
         self._update_ctrl_list_timer.timeout.connect(self._update_controllers)
         self._update_ctrl_list_timer.start()
 

From 8d90e7cd2e04078214cd32d7f88628b106869c32 Mon Sep 17 00:00:00 2001
From: v4hn <me@v4hn.de>
Date: Sat, 12 Oct 2024 14:04:52 +0200
Subject: [PATCH 2/2] require REQUIRED build deps as build_depend

This package is not very critical and it is unclear
what it should do at all when testing is disabled.
But as the CMakeLists.txt requires these packages during either build,
they are NOT just test dependencies.

Required to make use of added functions to exclude test depends in builds
https://github.com/ros-infrastructure/bloom/pull/649
---
 combined_robot_hw_tests/package.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/combined_robot_hw_tests/package.xml b/combined_robot_hw_tests/package.xml
index 20ec0f162..9263915b3 100644
--- a/combined_robot_hw_tests/package.xml
+++ b/combined_robot_hw_tests/package.xml
@@ -24,6 +24,8 @@
 
   <depend>combined_robot_hw</depend>
   <depend>controller_manager</depend>
+  <depend>controller_manager_msgs</depend>
+  <depend>controller_manager_tests</depend>
   <depend>hardware_interface</depend> <!-- exec_depend required for plugin -->
   <depend>roscpp</depend>
 
@@ -31,8 +33,6 @@
 
   <build_export_depend>pluginlib</build_export_depend>
 
-  <test_depend>controller_manager_msgs</test_depend>
-  <test_depend>controller_manager_tests</test_depend>
   <test_depend>rostest</test_depend>
 
   <export>