Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
2c8400c9
Commit
2c8400c9
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/ros-moveit] Add patch-aa
To fix build with recent boost versions
parent
34cab695
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ros-moveit/distinfo
+1
-0
1 addition, 0 deletions
ros-moveit/distinfo
ros-moveit/patches/patch-aa
+49
-0
49 additions, 0 deletions
ros-moveit/patches/patch-aa
with
50 additions
and
0 deletions
ros-moveit/distinfo
+
1
−
0
View file @
2c8400c9
SHA1 (ros/moveit/0.10.5.tar.gz) = 7e2588c64476de84fa773dc84a3ac029f0097b9c
RMD160 (ros/moveit/0.10.5.tar.gz) = f99ef77d4402fe887018d9408a982698225f712b
Size (ros/moveit/0.10.5.tar.gz) = 1942731 bytes
SHA1 (patch-aa) = 61b468cefd2173c4612179f9cfbc80103efbdfff
This diff is collapsed.
Click to expand it.
ros-moveit/patches/patch-aa
0 → 100644
+
49
−
0
View file @
2c8400c9
remove deprecated boost::signals, to fix compilation on recent Boost
ref https://github.com/ros-planning/moveit/pull/1353
--- moveit_ros/move_group//CMakeLists.txt.orig 2018-11-01 11:40:45.000000000 +0100
+++ moveit_ros/move_group//CMakeLists.txt 2020-04-01 10:10:09.049901339 +0200
@@ -7,7 +7,7 @@
set(CMAKE_BUILD_TYPE Release)
endif()
-find_package(Boost REQUIRED system filesystem date_time program_options signals thread)
+find_package(Boost REQUIRED system filesystem date_time program_options thread)
find_package(catkin REQUIRED COMPONENTS
moveit_core
moveit_ros_planning
--- moveit_ros/perception//CMakeLists.txt.orig 2018-11-01 11:40:45.000000000 +0100
+++ moveit_ros/perception//CMakeLists.txt 2020-04-01 10:10:13.066545757 +0200
@@ -9,7 +9,7 @@
set(CMAKE_BUILD_TYPE Release)
endif()
-find_package(Boost REQUIRED thread signals)
+find_package(Boost REQUIRED thread)
if(WITH_OPENGL)
find_package(OpenGL REQUIRED)
--- moveit_ros/planning/CMakeLists.txt.orig 2018-11-01 11:40:45.000000000 +0100
+++ moveit_ros/planning/CMakeLists.txt 2020-04-01 10:10:16.056529195 +0200
@@ -7,7 +7,7 @@
set(CMAKE_BUILD_TYPE Release)
endif()
-find_package(Boost REQUIRED system filesystem date_time program_options signals thread chrono)
+find_package(Boost REQUIRED system filesystem date_time program_options thread chrono)
find_package(catkin REQUIRED COMPONENTS
moveit_core
moveit_ros_perception
--- moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.h.orig 2018-11-01 11:40:45.000000000 +0100
+++ moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.h 2020-04-01 10:10:46.346361448 +0200
@@ -53,9 +53,7 @@
@brief Monitors the joint_states topic and tf to maintain the current state of the robot. */
class CurrentStateMonitor
{
- /* tf changed their interface between indigo and kinetic
- from boost::signals::connection to boost::signals2::connection */
- typedef decltype(tf2_ros::Buffer()._addTransformsChangedListener(boost::function<void(void)>())) TFConnection;
+ typedef boost::signals2::connection TFConnection;
public:
/**
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment