diff --git a/gazebo-10.1.0-automoc.patch b/gazebo-10.1.0-automoc.patch deleted file mode 100644 index 741a164b103c7478e7be5dd628fd3f4a5f1ed577..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-automoc.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up ./CMakeLists.txt.automoc ./CMakeLists.txt ---- ./CMakeLists.txt.automoc 2019-03-28 20:58:30.000000000 -0400 -+++ ./CMakeLists.txt 2020-08-22 18:22:13.315277325 -0400 -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.6 FAT - if(COMMAND CMAKE_POLICY) - CMAKE_POLICY(SET CMP0003 NEW) - CMAKE_POLICY(SET CMP0004 NEW) -+ CMAKE_POLICY(SET CMP0100 NEW) - endif(COMMAND CMAKE_POLICY) - - project (Gazebo) -@@ -250,7 +251,7 @@ filter_valid_compiler_flags(${WARN_LEVEL - # Check and add visibility hidden by default. Only in UNIX - # Windows and MacosX does not handled properly the hidden compilation - if (UNIX AND NOT APPLE) -- filter_valid_compiler_flags(-fvisibility=hidden -fvisibility-inlines-hidden) -+ filter_valid_compiler_flags(-fvisibility-inlines-hidden) - endif() - - if (MSVC) -@@ -260,9 +261,8 @@ if (MSVC) - endif() - - # Visual Studio enables c++11 support by default --if (NOT MSVC) -- set(UNFILTERED_FLAGS "-std=c++11") --endif() -+set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_EXTENSIONS OFF) - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}") - diff --git a/gazebo-10.1.0-boost173.patch b/gazebo-10.1.0-boost173.patch deleted file mode 100644 index a81213eb5232785bc9b0da7a5fd40eeafbb89b68..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-boost173.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up ./gazebo/gui/model/ModelTreeWidget.cc.boost173 ./gazebo/gui/model/ModelTreeWidget.cc ---- ./gazebo/gui/model/ModelTreeWidget.cc.boost173 2019-03-28 20:58:32.000000000 -0400 -+++ ./gazebo/gui/model/ModelTreeWidget.cc 2020-08-08 17:36:39.397952859 -0400 -@@ -24,6 +24,7 @@ - - using namespace gazebo; - using namespace gui; -+using namespace boost::placeholders; - - ///////////////////////////////////////////////// - ModelTreeWidget::ModelTreeWidget(QWidget *_parent) -diff -up ./gazebo/gui/model/SchematicViewWidget.cc.boost173 ./gazebo/gui/model/SchematicViewWidget.cc ---- ./gazebo/gui/model/SchematicViewWidget.cc.boost173 2019-03-28 20:58:32.000000000 -0400 -+++ ./gazebo/gui/model/SchematicViewWidget.cc 2020-08-08 17:36:39.397952859 -0400 -@@ -32,6 +32,7 @@ - - using namespace gazebo; - using namespace gui; -+using namespace boost::placeholders; - - ///////////////////////////////////////////////// - SchematicViewWidget::SchematicViewWidget(QWidget *_parent) -diff -up ./test/integration/model_database.cc.boost173 ./test/integration/model_database.cc ---- ./test/integration/model_database.cc.boost173 2020-08-08 19:45:51.176525049 -0400 -+++ ./test/integration/model_database.cc 2020-08-08 19:46:29.983287693 -0400 -@@ -20,6 +20,7 @@ - #include "test_config.h" - - using namespace gazebo; -+using namespace boost::placeholders; - - int g_onModels = 0; - int g_onModels1 = 0; -diff -up ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc.boost173 ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc ---- ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc.boost173 2020-08-08 19:47:14.683014303 -0400 -+++ ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc 2020-08-08 19:47:22.041969295 -0400 -@@ -21,6 +21,7 @@ - - - using namespace gazebo; -+using namespace boost::placeholders; - - GZ_REGISTER_SENSOR_PLUGIN(ForceTorqueModelRemovalTestPlugin) - diff --git a/gazebo-10.1.0-openal121.patch b/gazebo-10.1.0-openal121.patch deleted file mode 100644 index 733f28e4c99a664747b426ad36643e574040cdf1..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-openal121.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b4429a242c43e01c367bc02afa2c4a0e6b59dddd Mon Sep 17 00:00:00 2001 -From: Eric Timmons -Date: Tue, 3 Dec 2019 13:19:21 -0500 -Subject: [PATCH] Rename OpenAL types to remove _struct - -OpenAL v1.20.0 removed the names ALCdevice_struct and ALCcontext_struct -(https://github.com/kcat/openal-soft/commit/399dfca1e3352050a5289be6bcd7b7dce353ccf8). Use -the types ALCdevice and ALCcontext instead. ---- - gazebo/util/OpenALPrivate.hh | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/gazebo/util/OpenALPrivate.hh b/gazebo/util/OpenALPrivate.hh -index b69c72843c..30a9701f31 100644 ---- a/gazebo/util/OpenALPrivate.hh -+++ b/gazebo/util/OpenALPrivate.hh -@@ -25,9 +25,6 @@ - - #ifdef HAVE_OPENAL - --struct ALCcontext_struct; --struct ALCdevice_struct; -- - namespace gazebo - { - namespace util -@@ -37,10 +34,10 @@ namespace gazebo - class OpenALPrivate - { - /// \brief OpenAL audio context pointer. -- public: ALCcontext_struct *context; -+ public: ALCcontext *context; - - /// \brief OpenAL audio device pointer. -- public: ALCdevice_struct *audioDevice; -+ public: ALCdevice *audioDevice; - - /// \brief OpenAL sink pointer. - public: OpenALSinkPtr sink; diff --git a/gazebo-10.1.0-qwt.patch b/gazebo-10.1.0-qwt.patch deleted file mode 100644 index 53e922e47e090895ebf7218466a2faa4395be806..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-qwt.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -rupN gazebo-10.1.0/gazebo/gui/plot/IncrementalPlot.cc gazebo-10.1.0-new/gazebo/gui/plot/IncrementalPlot.cc ---- gazebo-10.1.0/gazebo/gui/plot/IncrementalPlot.cc 2019-03-29 01:58:32.000000000 +0100 -+++ gazebo-10.1.0-new/gazebo/gui/plot/IncrementalPlot.cc 2022-12-21 18:08:37.162024275 +0100 -@@ -25,6 +25,8 @@ - - #include - -+#include -+ - #include "gazebo/common/Console.hh" - #include "gazebo/common/Time.hh" - -diff -rupN gazebo-10.1.0/gazebo/gui/plot/PlotCurve.cc gazebo-10.1.0-new/gazebo/gui/plot/PlotCurve.cc ---- gazebo-10.1.0/gazebo/gui/plot/PlotCurve.cc 2019-03-29 01:58:32.000000000 +0100 -+++ gazebo-10.1.0-new/gazebo/gui/plot/PlotCurve.cc 2022-12-22 10:41:46.139129727 +0100 -@@ -62,71 +62,71 @@ namespace gazebo - /// \return Bounding box of the sample. - public: virtual QRectF boundingRect() const - { -- if (this->d_boundingRect.width() < 0.0) -- this->d_boundingRect = qwtBoundingRect(*this); -+ if (this->boundingRect().width() < 0.0) -+ this->boundingRect() = qwtBoundingRect(*this); - - // set a minimum bounding box height - // this prevents plot's auto scale to zoom in on near-zero - // floating point noise. - double minHeight = 1e-3; -- double absHeight = std::fabs(this->d_boundingRect.height()); -+ double absHeight = std::fabs(this->boundingRect().height()); - if (absHeight < minHeight) - { - double halfMinHeight = minHeight * 0.5; -- double mid = this->d_boundingRect.top() + -+ double mid = this->boundingRect().top() + - (absHeight * 0.5); -- this->d_boundingRect.setTop(mid - halfMinHeight); -- this->d_boundingRect.setBottom(mid + halfMinHeight); -+ this->boundingRect().setTop(mid - halfMinHeight); -+ this->boundingRect().setBottom(mid + halfMinHeight); - } - -- return this->d_boundingRect; -+ return this->boundingRect(); - } - - /// \brief Add a point to the sample. - /// \param[in] _point Point to add. - public: inline void Add(const QPointF &_point) - { -- this->d_samples += _point; -+ this->m_samples += _point; - -- if (this->d_samples.size() > maxSampleSize) -+ if (this->m_samples.size() > maxSampleSize) - { - // remove sample window - // update bounding rect? -- this->d_samples.remove(0, windowSize); -+ this->m_samples.remove(0, windowSize); - } - -- if (this->d_samples.size() == 1) -+ if (this->m_samples.size() == 1) - { - // init bounding rect -- this->d_boundingRect.setTopLeft(_point); -- this->d_boundingRect.setBottomRight(_point); -+ this->boundingRect().setTopLeft(_point); -+ this->boundingRect().setBottomRight(_point); - return; - } - - // expand bounding rect -- if (_point.x() < this->d_boundingRect.left()) -- this->d_boundingRect.setLeft(_point.x()); -- else if (_point.x() > this->d_boundingRect.right()) -- this->d_boundingRect.setRight(_point.x()); -- if (_point.y() < this->d_boundingRect.top()) -- this->d_boundingRect.setTop(_point.y()); -- else if (_point.y() > this->d_boundingRect.bottom()) -- this->d_boundingRect.setBottom(_point.y()); -+ if (_point.x() < this->boundingRect().left()) -+ this->boundingRect().setLeft(_point.x()); -+ else if (_point.x() > this->boundingRect().right()) -+ this->boundingRect().setRight(_point.x()); -+ if (_point.y() < this->boundingRect().top()) -+ this->boundingRect().setTop(_point.y()); -+ else if (_point.y() > this->boundingRect().bottom()) -+ this->boundingRect().setBottom(_point.y()); - } - - /// \brief Clear the sample data. - public: void Clear() - { -- this->d_samples.clear(); -- this->d_samples.squeeze(); -- this->d_boundingRect = QRectF(0.0, 0.0, -1.0, -1.0); -+ this->m_samples.clear(); -+ this->m_samples.squeeze(); -+ this->boundingRect() = QRectF(0.0, 0.0, -1.0, -1.0); - } - - /// \brief Get the sample data. - /// \return A vector of same points. - public: QVector Samples() const - { -- return this->d_samples; -+ return this->m_samples; - } - - /// \brief maxium sample size of this curve. diff --git a/gazebo-10.1.0-singleton.patch b/gazebo-10.1.0-singleton.patch deleted file mode 100644 index 54e768d1cc0a45e1450f1586d3c04860a054a802..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-singleton.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up ./gazebo/common/SingletonT.hh.singleton ./gazebo/common/SingletonT.hh ---- ./gazebo/common/SingletonT.hh.singleton 2020-02-23 13:32:20.278829812 -0500 -+++ ./gazebo/common/SingletonT.hh 2020-02-23 13:32:29.579857904 -0500 -@@ -55,19 +55,7 @@ class SingletonT - /// \brief Helper to declare typed SingletonT - // clang doesn't compile if it explicitly specializes a type before - // the type is defined. (forward declaration is not enough.) --#ifdef __clang__ - #define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType) --#else --#define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType) \ --namespace n1 \ --{ \ -- namespace n2 \ -- { \ -- class singletonType; \ -- } \ --} \ --template class visibility ::SingletonT; --#endif - - /// \} - diff --git a/gazebo-10.1.0-tbb.patch b/gazebo-10.1.0-tbb.patch deleted file mode 100644 index a71239d3473edb3bbeb3a0f2afcb6674a30abd11..0000000000000000000000000000000000000000 --- a/gazebo-10.1.0-tbb.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -up ./gazebo/physics/ode/ODEPhysics.hh.tbb ./gazebo/physics/ode/ODEPhysics.hh ---- ./gazebo/physics/ode/ODEPhysics.hh.tbb 2019-03-28 20:58:33.000000000 -0400 -+++ ./gazebo/physics/ode/ODEPhysics.hh 2020-04-19 14:00:41.142749690 -0400 -@@ -17,8 +17,10 @@ - #ifndef _ODEPHYSICS_HH_ - #define _ODEPHYSICS_HH_ - -+#ifndef Q_MOC_RUN - #include - #include -+#endif - #include - #include - -diff -up ./gazebo/physics/physics_pch.hh.tbb ./gazebo/physics/physics_pch.hh ---- ./gazebo/physics/physics_pch.hh.tbb 2019-03-28 20:58:33.000000000 -0400 -+++ ./gazebo/physics/physics_pch.hh 2020-04-19 14:00:41.142749690 -0400 -@@ -53,10 +53,12 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include - #include - #include - #include -+#endif - #include - #include - #include -diff -up ./gazebo/transport/Connection.hh.tbb ./gazebo/transport/Connection.hh ---- ./gazebo/transport/Connection.hh.tbb 2019-03-28 20:58:33.000000000 -0400 -+++ ./gazebo/transport/Connection.hh 2020-04-19 14:00:41.143749697 -0400 -@@ -17,7 +17,9 @@ - #ifndef _CONNECTION_HH_ - #define _CONNECTION_HH_ - -+#ifndef Q_MOC_RUN - #include -+#endif - #include - - #include -diff -up ./gazebo/transport/Node.hh.tbb ./gazebo/transport/Node.hh ---- ./gazebo/transport/Node.hh.tbb 2019-03-28 20:58:33.000000000 -0400 -+++ ./gazebo/transport/Node.hh 2020-04-19 14:00:41.143749697 -0400 -@@ -18,7 +18,9 @@ - #ifndef GAZEBO_TRANSPORT_NODE_HH_ - #define GAZEBO_TRANSPORT_NODE_HH_ - -+#ifndef Q_MOC_RUN - #include -+#endif - #include - #include - #include -diff -up ./gazebo/transport/transport_pch.hh.tbb ./gazebo/transport/transport_pch.hh ---- ./gazebo/transport/transport_pch.hh.tbb 2019-03-28 20:58:33.000000000 -0400 -+++ ./gazebo/transport/transport_pch.hh 2020-04-19 14:00:41.143749697 -0400 -@@ -44,8 +44,10 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include - #include - #include -+#endif - #include - #include diff --git a/gazebo-10.2.0-graphviz-10.patch b/gazebo-10.2.0-graphviz-10.patch deleted file mode 100644 index 34e82aa3b0358207a4cd80c2d4ff42874afeffbd..0000000000000000000000000000000000000000 --- a/gazebo-10.2.0-graphviz-10.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -rupN --no-dereference gazebo-10.2.0/gazebo/gui/qgv/QGVSubGraph.cpp gazebo-10.2.0-new/gazebo/gui/qgv/QGVSubGraph.cpp ---- gazebo-10.2.0/gazebo/gui/qgv/QGVSubGraph.cpp 2020-02-01 00:02:56.000000000 +0100 -+++ gazebo-10.2.0-new/gazebo/gui/qgv/QGVSubGraph.cpp 2024-05-15 11:41:54.481854484 +0200 -@@ -44,13 +44,13 @@ QString QGVSubGraph::name() const - - QGVNode *QGVSubGraph::addNode(const QString &label) - { -- Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE); -+ Agnode_t *node = agnode(_sgraph->graph(), NULL, 1); - if (node == NULL) - { - qWarning()<<"Invalid sub node :"<graph(), node, TRUE); -+ agsubnode(_sgraph->graph(), node, 1); - - QGVNode *item = new QGVNode(new QGVNodePrivate(node), _scene); - item->setLabel(label); -@@ -66,10 +66,10 @@ QGVSubGraph *QGVSubGraph::addSubGraph(co - if (cluster) - { - sgraph = agsubg(_sgraph->graph(), -- ("cluster_" + _name).toLocal8Bit().data(), TRUE); -+ ("cluster_" + _name).toLocal8Bit().data(), 1); - } - else -- sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), TRUE); -+ sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), 1); - - if (sgraph == NULL) - { diff --git a/gazebo-2.2.2-connection.patch b/gazebo-2.2.2-connection.patch deleted file mode 100644 index 2bd0d24d37e4665e3128632eecd705b83a3c5019..0000000000000000000000000000000000000000 --- a/gazebo-2.2.2-connection.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ./gazebo/transport/Connection.cc.orig 2014-02-23 18:58:35.226997266 +0400 -+++ ./gazebo/transport/Connection.cc 2014-02-23 19:02:49.123645564 +0400 -@@ -842,6 +842,8 @@ void Connection::OnConnect(const boost:: - this->remoteURI = std::string("http://") + this->GetRemoteHostname() - + ":" + boost::lexical_cast(this->GetRemotePort()); - -+ try -+ { - if (this->socket && this->socket->is_open()) - { - this->remoteAddress = -@@ -852,6 +854,12 @@ void Connection::OnConnect(const boost:: - this->connectError = true; - gzerr << "Invalid socket connection\n"; - } -+ } -+ catch (std::exception& e) -+ { -+ this->connectError = true; -+ gzerr << "Error handling socket connection: " << e.what() << "\n"; -+ } - - // Notify the condition that it may proceed. - this->connectCondition.notify_one(); - diff --git a/gazebo-7.3.1-rpath.patch b/gazebo-7.3.1-rpath.patch deleted file mode 100644 index da4b4881834115ceb613707a795d492a40105409..0000000000000000000000000000000000000000 --- a/gazebo-7.3.1-rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up ./cmake/pkgconfig/gazebo_ode.in.rpath ./cmake/pkgconfig/gazebo_ode.in ---- ./cmake/pkgconfig/gazebo_ode.in.rpath 2016-07-17 16:56:03.573441677 -0400 -+++ ./cmake/pkgconfig/gazebo_ode.in 2016-07-17 16:56:41.456910272 -0400 -@@ -6,5 +6,5 @@ Name: gazebo - Description: Gazebo Exported ODE Libraries - Version: @GAZEBO_VERSION_FULL@ - Requires: --Libs: -Wl,-rpath,${prefix}/@CMAKE_INSTALL_LIBDIR@ -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode -+Libs: -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode - CFlags: -I${includedir}/gazebo-@GAZEBO_MAJOR_VERSION@ diff --git a/gazebo-7.4.0-fixtest.patch b/gazebo-7.4.0-fixtest.patch deleted file mode 100644 index a5f293fe0d6e7a52e19053a5aaf1ffcdd78fd9bf..0000000000000000000000000000000000000000 --- a/gazebo-7.4.0-fixtest.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./test/performance/RAMLibrary.hh.fixtest ./test/performance/RAMLibrary.hh ---- ./test/performance/RAMLibrary.hh.fixtest 2016-11-23 15:10:03.088455621 -0500 -+++ ./test/performance/RAMLibrary.hh 2016-11-23 15:10:11.464781852 -0500 -@@ -20,7 +20,7 @@ - - #ifdef _WIN32 - #elif __APPLE__ --#elif __linux -+#else - #include - #include - #include diff --git a/gazebo-9.5.0-fedora.patch b/gazebo-9.5.0-fedora.patch deleted file mode 100644 index c5485301f5fedd7beefc27b9a8415dfd16573398..0000000000000000000000000000000000000000 --- a/gazebo-9.5.0-fedora.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake ---- ./cmake/SearchForStuff.cmake.fedora 2018-11-19 17:34:10.000000000 -0500 -+++ ./cmake/SearchForStuff.cmake 2019-02-04 20:53:15.293222760 -0500 -@@ -502,6 +502,13 @@ if (PKG_CONFIG_FOUND) - endif () - - ######################################## -+ # Find SkyX -+ pkg_check_modules(SKYX SKYX) -+ if (NOT SKYX_FOUND) -+ BUILD_WARNING("SkyX not found, using private copy of SkyX") -+ endif() -+ -+ ######################################## - # Find Player - pkg_check_modules(PLAYER playercore>=3.0 playerc++ playerwkb) - if (NOT PLAYER_FOUND) -@@ -795,7 +802,7 @@ endif() - ######################################## - # Find QWT (QT graphing library) - find_path(QWT_INCLUDE_DIR NAMES qwt.h PATHS -- /usr/include -+ /usr/include/qt5 - /usr/local/include - /usr/local/lib/qwt.framework/Headers - ${QWT_WIN_INCLUDE_DIR} -diff -up ./gazebo/rendering/Camera.cc.fedora ./gazebo/rendering/Camera.cc ---- ./gazebo/rendering/Camera.cc.fedora 2018-11-19 17:34:12.000000000 -0500 -+++ ./gazebo/rendering/Camera.cc 2019-02-04 20:52:55.797154299 -0500 -@@ -36,7 +36,7 @@ - #include "gazebo/common/win_dirent.h" - #endif - --#include "gazebo/rendering/skyx/include/SkyX.h" -+#include "SkyX.h" - - #include "gazebo/common/Assert.hh" - #include "gazebo/common/Events.hh" -diff -up ./gazebo/rendering/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt ---- ./gazebo/rendering/CMakeLists.txt.fedora 2018-11-19 17:34:12.000000000 -0500 -+++ ./gazebo/rendering/CMakeLists.txt 2019-02-04 20:52:55.797154299 -0500 -@@ -3,10 +3,15 @@ include (${gazebo_cmake_dir}/GazeboUtils - include_directories(SYSTEM - ${OGRE_INCLUDE_DIRS} - ${TBB_INCLUDEDIR} -- skyx -- skyx/include - ) - -+if (SKYX_FOUND) -+ include_directories(SYSTEM ${SKYX_INCLUDE_DIRS}) -+else() -+ include_directories(skyx skyx/include) -+endif() -+ -+ - if (WIN32) - include_directories(${libdl_include_dir}) - endif() -@@ -146,7 +151,10 @@ if (${OGRE_VERSION} VERSION_GREATER 1.7. - endif() - - add_subdirectory(selection_buffer) -+ -+if (NOT SKYX_FOUND) - add_subdirectory(skyx) -+endif() - - if (HAVE_OCULUS) - set (sources ${sources} -@@ -229,6 +237,10 @@ target_link_libraries(gazebo_rendering - ${IGNITION-MSGS_LIBRARIES} - ) - -+if (SKYX_FOUND) -+ target_link_libraries(gazebo_rendering ${SKYX_LIBRARIES}) -+endif() -+ - if (HAVE_OCULUS) - target_link_libraries(gazebo_rendering ${OculusVR_LIBRARIES}) - endif() diff --git a/gazebo-9.5.0-python3.patch b/gazebo-9.5.0-python3.patch deleted file mode 100644 index f3c6f4c539a4fa74a42ea2153b33464f530a96bb..0000000000000000000000000000000000000000 --- a/gazebo-9.5.0-python3.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up gazebo-9.5.0/tools/check_test_ran.py.py3 gazebo-9.5.0/tools/check_test_ran.py ---- gazebo-9.5.0/tools/check_test_ran.py.py3 2018-11-19 17:34:15.000000000 -0500 -+++ gazebo-9.5.0/tools/check_test_ran.py 2019-11-11 20:14:29.128822529 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Software License Agreement (BSD License) - # - # Copyright (c) 2008, Willow Garage, Inc. -diff -up gazebo-9.5.0/tools/gl-test.py.py3 gazebo-9.5.0/tools/gl-test.py ---- gazebo-9.5.0/tools/gl-test.py.py3 2018-11-19 17:34:15.000000000 -0500 -+++ gazebo-9.5.0/tools/gl-test.py 2019-11-11 20:14:52.391741667 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - from OpenGL.GLUT import * - import sys - diff --git a/gazebo-9.5.0-wayland.patch b/gazebo-9.5.0-wayland.patch deleted file mode 100644 index 4335aba762fee0fba8b8dd08b1e31bcc04f60e08..0000000000000000000000000000000000000000 --- a/gazebo-9.5.0-wayland.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up ./gazebo/gazebo_main.cc.wayland ./gazebo/gazebo_main.cc ---- ./gazebo/gazebo_main.cc.wayland 2019-03-28 20:58:31.000000000 -0400 -+++ ./gazebo/gazebo_main.cc 2020-04-18 21:28:37.920694447 -0400 -@@ -131,6 +131,25 @@ int main(int _argc, char **_argv) - return 0; - } - -+ std::vector newEnv; -+ char **environment = environ; -+ -+ while(*environment != nullptr) -+ { -+ newEnv.push_back(*environment); -+ ++environment; -+ } -+ newEnv.push_back("QT_QPA_PLATFORM=xcb"); -+ -+ char** modifiedEnv = (char**)malloc(sizeof(char*) * newEnv.size() + 1); -+ modifiedEnv[newEnv.size()] = nullptr; -+ -+ for(size_t ii = 0; ii < newEnv.size(); ++ii) -+ { -+ modifiedEnv[ii] = &newEnv[ii][0]; -+ } -+ -+ - struct sigaction sigact; - sigact.sa_flags = 0; - sigact.sa_handler = sig_handler; -@@ -199,7 +218,7 @@ int main(int _argc, char **_argv) - { - // remove client from foreground process group - setpgid(0, 0); -- execvp(argvClient[0], argvClient); -+ execvpe(argvClient[0], argvClient, modifiedEnv); - } - } - else diff --git a/gazebo-gaussian-noise-model-with-0-bias-stddev.patch b/gazebo-gaussian-noise-model-with-0-bias-stddev.patch deleted file mode 100644 index 6aaf7f02903e9389e24898958037356d9d92f668..0000000000000000000000000000000000000000 --- a/gazebo-gaussian-noise-model-with-0-bias-stddev.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up ./gazebo/sensors/GaussianNoiseModel.cc.gaussianstddev ./gazebo/sensors/GaussianNoiseModel.cc ---- ./gazebo/sensors/GaussianNoiseModel.cc.gaussianstddev 2020-01-18 13:54:05.637290373 -0500 -+++ ./gazebo/sensors/GaussianNoiseModel.cc 2020-01-18 13:55:36.961532289 -0500 -@@ -193,8 +193,12 @@ double GaussianNoiseModel::GetBias() con - ////////////////////////////////////////////////// - void GaussianNoiseModel::SampleBias() - { -- this->bias = -+ if (this->biasStdDev > 0) { -+ this->bias = - ignition::math::Rand::DblNormal(this->biasMean, this->biasStdDev); -+ } else { -+ this->bias = this->biasMean; -+ } - // With equal probability, we pick a negative bias (by convention, - // rateBiasMean should be positive, though it would work fine if - // negative). diff --git a/gazebo-pr2862-simpletrackedvehicle-fix-for-boost-1.74.patch b/gazebo-pr2862-simpletrackedvehicle-fix-for-boost-1.74.patch deleted file mode 100644 index 0f0b153dac93f966163644fc9d5e59396859f4a5..0000000000000000000000000000000000000000 --- a/gazebo-pr2862-simpletrackedvehicle-fix-for-boost-1.74.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up ./plugins/SimpleTrackedVehiclePlugin.cc.boost174 ./plugins/SimpleTrackedVehiclePlugin.cc ---- ./plugins/SimpleTrackedVehiclePlugin.cc.boost174 2020-01-31 18:02:56.000000000 -0500 -+++ ./plugins/SimpleTrackedVehiclePlugin.cc 2023-11-24 15:05:35.818739576 -0500 -@@ -18,6 +18,8 @@ - #include - #include - -+#include -+ - #include - #include - -@@ -29,6 +31,7 @@ - - #include "plugins/SimpleTrackedVehiclePlugin.hh" - -+#if BOOST_VERSION < 107400 - namespace std { - template - class hash> { -@@ -37,6 +40,7 @@ class hash> { - } - }; - } -+#endif - - namespace gazebo - { diff --git a/gazebo-pr3290-gcc13-array-include.patch b/gazebo-pr3290-gcc13-array-include.patch deleted file mode 100644 index 2298458fd3ae31eb4fce41f631a1561461d89591..0000000000000000000000000000000000000000 --- a/gazebo-pr3290-gcc13-array-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1686da35135163c635adf8f6bc618228f9ed7abd Mon Sep 17 00:00:00 2001 -From: Steve Peters -Date: Wed, 25 Jan 2023 23:42:07 -0800 -Subject: [PATCH] msgs.cc: add missing include - -Fixes homebrew build. - -Signed-off-by: Steve Peters ---- - gazebo/msgs/msgs.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gazebo/msgs/msgs.cc b/gazebo/msgs/msgs.cc -index 7eaa66d56c..6fc83841df 100644 ---- a/gazebo/msgs/msgs.cc -+++ b/gazebo/msgs/msgs.cc -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/gazebo-pr3345-fix-build-with-graphviz-9.patch b/gazebo-pr3345-fix-build-with-graphviz-9.patch deleted file mode 100644 index 662ca1190016986a1704e2abe6179a8b5a6881b2..0000000000000000000000000000000000000000 --- a/gazebo-pr3345-fix-build-with-graphviz-9.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 87ac01bd72c7b35217ab9ebf69cba69dc7780b39 Mon Sep 17 00:00:00 2001 -From: Steve Peters -Date: Fri, 15 Sep 2023 10:11:58 -0700 -Subject: [PATCH] Fix build with graphviz 9 (#3345) - -Signed-off-by: Steve Peters ---- - cmake/SearchForStuff.cmake | 3 +++ - gazebo/gui/CMakeLists.txt | 5 +++++ - gazebo/gui/qgv/private/QGVCore.h | 3 +++ - 3 files changed, 11 insertions(+) - -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 4f5859781d..732cbb4e2d 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -781,6 +781,9 @@ if (NOT GRAPHVIZ_FOUND) - else () - message (STATUS "Looking for libgraphviz-dev - found") - set (HAVE_GRAPHVIZ ON CACHE BOOL "HAVE GRAPHVIZ" FORCE) -+ if (${GRAPHVIZ_CGRAPH_PKG_VERSION} VERSION_LESS 9.0) -+ set(GRAPHVIZ_VERSION_LT_9 TRUE) -+ endif () - endif () - - ######################################## -diff --git a/gazebo/gui/CMakeLists.txt b/gazebo/gui/CMakeLists.txt -index d9a3326455..313595726b 100644 ---- a/gazebo/gui/CMakeLists.txt -+++ b/gazebo/gui/CMakeLists.txt -@@ -206,6 +206,11 @@ add_dependencies(gzclient gazebo_gui) - target_compile_definitions(gazebo_gui - PRIVATE BUILDING_DLL_GZ_GUI - ) -+if (GRAPHVIZ_VERSION_LT_9) -+ target_compile_definitions(gazebo_gui -+ PRIVATE GRAPHVIZ_VERSION_LT_9 -+ ) -+endif() - - target_link_libraries(gazebo_gui - libgazebo_client -diff --git a/gazebo/gui/qgv/private/QGVCore.h b/gazebo/gui/qgv/private/QGVCore.h -index 48ec1a10df..1bf3a8e846 100644 ---- a/gazebo/gui/qgv/private/QGVCore.h -+++ b/gazebo/gui/qgv/private/QGVCore.h -@@ -102,7 +102,10 @@ class QGVCore - rdr.len = strlen(cp); - rdr.cur = 0; - -+#ifdef GRAPHVIZ_VERSION_LT_9 -+ // This variable only exists for versions before Graphviz 9.0 - disc.mem = &AgMemDisc; -+#endif - disc.id = &AgIdDisc; - disc.io = &memIoDisc; - g = agread(&rdr, &disc); -