diff options
author | Alexis Ballier <aballier@gentoo.org> | 2021-01-20 16:08:09 +0100 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2021-01-20 16:33:12 +0100 |
commit | e172420d6da7928006f9c54a5b016e62735de7f9 (patch) | |
tree | 6a2cea1078fad5306f420abb1d6e58cbaa64317e /sci-electronics/gazebo/files | |
parent | ros-meta/diagnostics: Bump to 1.10.3. (diff) | |
download | gentoo-e172420d6da7928006f9c54a5b016e62735de7f9.tar.gz gentoo-e172420d6da7928006f9c54a5b016e62735de7f9.tar.bz2 gentoo-e172420d6da7928006f9c54a5b016e62735de7f9.zip |
sci-electronics/gazebo: bump to 11.3.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r-- | sci-electronics/gazebo/files/boost173.patch | 135 | ||||
-rw-r--r-- | sci-electronics/gazebo/files/boost174.patch | 20 | ||||
-rw-r--r-- | sci-electronics/gazebo/files/qwt.patch | 47 |
3 files changed, 0 insertions, 202 deletions
diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch deleted file mode 100644 index 618f6f1b5349..000000000000 --- a/sci-electronics/gazebo/files/boost173.patch +++ /dev/null @@ -1,135 +0,0 @@ -Index: gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc -=================================================================== ---- gazebo-11.0.0.orig/gazebo/gui/model/ModelTreeWidget.cc -+++ gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc -@@ -162,7 +162,7 @@ ModelTreeWidget::ModelTreeWidget(QWidget - // Connections - this->connections.push_back( - gui::model::Events::ConnectSaveModel( -- boost::bind(&ModelTreeWidget::OnSaveModel, this, _1))); -+ boost::bind(&ModelTreeWidget::OnSaveModel, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectNewModel( -@@ -170,11 +170,11 @@ ModelTreeWidget::ModelTreeWidget(QWidget - - this->connections.push_back( - gui::model::Events::ConnectModelPropertiesChanged( -- boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectModelNameChanged( -- boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1))); -+ boost::bind(&ModelTreeWidget::OnModelNameChanged, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectNestedModelInserted( -@@ -183,51 +183,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget - - this->connections.push_back( - gui::model::Events::ConnectLinkInserted( -- boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1))); -+ boost::bind(&ModelTreeWidget::OnLinkInserted, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectJointInserted( -- boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4))); -+ boost::bind(&ModelTreeWidget::OnJointInserted, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4))); - - this->connections.push_back( - gui::model::Events::ConnectModelPluginInserted( -- boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1))); -+ boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectNestedModelRemoved( -- boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1))); -+ boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectLinkRemoved( -- boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1))); -+ boost::bind(&ModelTreeWidget::OnLinkRemoved, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectJointRemoved( -- boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1))); -+ boost::bind(&ModelTreeWidget::OnJointRemoved, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectModelPluginRemoved( -- boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1))); -+ boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, boost::placeholders::_1))); - - this->connections.push_back( - gui::model::Events::ConnectJointNameChanged( -- boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnJointNameChanged, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - event::Events::ConnectSetSelectedEntity( -- boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectSetSelectedEntity( -- boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectSetSelectedJoint( -- boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectSetSelectedModelPlugin( -- boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2))); -+ boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->ClearModelTree(); - } -Index: gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc -=================================================================== ---- gazebo-11.0.0.orig/gazebo/gui/model/SchematicViewWidget.cc -+++ gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc -@@ -83,31 +83,31 @@ void SchematicViewWidget::Reset() - void SchematicViewWidget::Init() - { - this->connections.push_back(gui::model::Events::ConnectLinkInserted( -- boost::bind(&SchematicViewWidget::AddNode, this, _1))); -+ boost::bind(&SchematicViewWidget::AddNode, this, boost::placeholders::_1))); - - this->connections.push_back(gui::model::Events::ConnectLinkRemoved( -- boost::bind(&SchematicViewWidget::RemoveNode, this, _1))); -+ boost::bind(&SchematicViewWidget::RemoveNode, this, boost::placeholders::_1))); - - this->connections.push_back(gui::model::Events::ConnectJointInserted( -- boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5))); -+ boost::bind(&SchematicViewWidget::AddEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5))); - - this->connections.push_back(gui::model::Events::ConnectJointRemoved( -- boost::bind(&SchematicViewWidget::RemoveEdge, this, _1))); -+ boost::bind(&SchematicViewWidget::RemoveEdge, this, boost::placeholders::_1))); - - this->connections.push_back(gui::model::Events::ConnectJointChanged( -- boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5))); -+ boost::bind(&SchematicViewWidget::UpdateEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5))); - - this->connections.push_back( - event::Events::ConnectSetSelectedEntity( -- boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2))); -+ boost::bind(&SchematicViewWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectSetSelectedEntity( -- boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2))); -+ boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2))); - - this->connections.push_back( - gui::model::Events::ConnectSetSelectedJoint( -- boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2))); -+ boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2))); - } - - ///////////////////////////////////////////////// diff --git a/sci-electronics/gazebo/files/boost174.patch b/sci-electronics/gazebo/files/boost174.patch deleted file mode 100644 index 82bbdf40f7a7..000000000000 --- a/sci-electronics/gazebo/files/boost174.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc -=================================================================== ---- gazebo-11.1.0.orig/plugins/SimpleTrackedVehiclePlugin.cc -+++ gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc -@@ -30,6 +30,7 @@ - - #include "plugins/SimpleTrackedVehiclePlugin.hh" - -+#if BOOST_VERSION < 107400 || defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - namespace std { - template<class T> - class hash<boost::shared_ptr<T>> { -@@ -38,6 +39,7 @@ class hash<boost::shared_ptr<T>> { - } - }; - } -+#endif - - namespace gazebo - { diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch index d7bbce2f8cbe..d4f1538900bc 100644 --- a/sci-electronics/gazebo/files/qwt.patch +++ b/sci-electronics/gazebo/files/qwt.patch @@ -15,50 +15,3 @@ Index: gazebo-8.0.0/cmake/SearchForStuff.cmake /usr/lib /usr/local/lib /usr/local/lib/qwt.framework -Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h -=================================================================== ---- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h -+++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h -@@ -23,24 +23,24 @@ - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wfloat-equal" - --#include <qwt/qwt_curve_fitter.h> --#include <qwt/qwt_legend.h> --#include <qwt/qwt_painter.h> --#include <qwt/qwt_picker_machine.h> --#include <qwt/qwt_plot.h> --#include <qwt/qwt_plot_canvas.h> --#include <qwt/qwt_plot_curve.h> --#include <qwt/qwt_plot_directpainter.h> --#include <qwt/qwt_plot_grid.h> --#include <qwt/qwt_plot_layout.h> --#include <qwt/qwt_plot_magnifier.h> --#include <qwt/qwt_plot_marker.h> --#include <qwt/qwt_plot_panner.h> --#include <qwt/qwt_plot_zoomer.h> --#include <qwt/qwt_scale_engine.h> --#include <qwt/qwt_scale_widget.h> --#include <qwt/qwt_symbol.h> --#include <qwt/qwt_plot_renderer.h> -+#include <qwt6/qwt_curve_fitter.h> -+#include <qwt6/qwt_legend.h> -+#include <qwt6/qwt_painter.h> -+#include <qwt6/qwt_picker_machine.h> -+#include <qwt6/qwt_plot.h> -+#include <qwt6/qwt_plot_canvas.h> -+#include <qwt6/qwt_plot_curve.h> -+#include <qwt6/qwt_plot_directpainter.h> -+#include <qwt6/qwt_plot_grid.h> -+#include <qwt6/qwt_plot_layout.h> -+#include <qwt6/qwt_plot_magnifier.h> -+#include <qwt6/qwt_plot_marker.h> -+#include <qwt6/qwt_plot_panner.h> -+#include <qwt6/qwt_plot_zoomer.h> -+#include <qwt6/qwt_scale_engine.h> -+#include <qwt6/qwt_scale_widget.h> -+#include <qwt6/qwt_symbol.h> -+#include <qwt6/qwt_plot_renderer.h> - - #pragma clang diagnostic pop - |