From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DDCA1382C5 for ; Wed, 20 Jan 2021 15:33:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBB9FE0869; Wed, 20 Jan 2021 15:33:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99B09E0869 for ; Wed, 20 Jan 2021 15:33:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3571D340A38 for ; Wed, 20 Jan 2021 15:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4337A4B3 for ; Wed, 20 Jan 2021 15:33:19 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1611156792.e172420d6da7928006f9c54a5b016e62735de7f9.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/gazebo/Manifest sci-electronics/gazebo/files/boost173.patch sci-electronics/gazebo/files/boost174.patch sci-electronics/gazebo/files/qwt.patch sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild sci-electronics/gazebo/gazebo-11.3.0.ebuild X-VCS-Directories: sci-electronics/gazebo/files/ sci-electronics/gazebo/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e172420d6da7928006f9c54a5b016e62735de7f9 X-VCS-Branch: master Date: Wed, 20 Jan 2021 15:33:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 99302610-9f89-4f86-8a00-1af4d0ce7e74 X-Archives-Hash: 95951701931c2a0a039a8e1255c6f90a commit: e172420d6da7928006f9c54a5b016e62735de7f9 Author: Alexis Ballier gentoo org> AuthorDate: Wed Jan 20 15:08:09 2021 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Jan 20 15:33:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e172420d sci-electronics/gazebo: bump to 11.3.0 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Alexis Ballier gentoo.org> sci-electronics/gazebo/Manifest | 2 +- sci-electronics/gazebo/files/boost173.patch | 135 --------------------- sci-electronics/gazebo/files/boost174.patch | 20 --- sci-electronics/gazebo/files/qwt.patch | 47 ------- ...azebo-11.1.0-r1.ebuild => gazebo-11.3.0.ebuild} | 8 +- 5 files changed, 4 insertions(+), 208 deletions(-) diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 5e66a9b6169..ce307cd34ad 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1 +1 @@ -DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76 +DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970 diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch deleted file mode 100644 index 618f6f1b534..00000000000 --- 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 82bbdf40f7a..00000000000 --- 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 hash> { -@@ -38,6 +39,7 @@ class hash> { - } - }; - } -+#endif - - namespace gazebo - { diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch index d7bbce2f8cb..d4f1538900b 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 --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #pragma clang diagnostic pop - diff --git a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.3.0.ebuild similarity index 91% rename from sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild rename to sci-electronics/gazebo/gazebo-11.3.0.ebuild index 2bb213d040a..e1a11ffee74 100644 --- a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild +++ b/sci-electronics/gazebo/gazebo-11.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -64,14 +64,12 @@ BDEPEND=" CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( "${FILESDIR}/qwt.patch" - "${FILESDIR}/boost173.patch" "${FILESDIR}/cmake.patch" - "${FILESDIR}/boost174.patch" ) src_configure() { - # doesnt build with as-needed - #append-ldflags "-Wl,--no-as-needed" + # find OGRE properly + sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die local mycmakeargs=( "-DUSE_UPSTREAM_CFLAGS=OFF"