gentoo auto-resync : 17:04:2024 - 12:04:27

4 files changed, 49 insertions, 2 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 89ed05980f64..42665118ed15 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index ff8d10dc550e..977e3259f2d5 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,8 +1,9 @@
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
+AUX gv10.patch 1617 BLAKE2B 2fee9681e2f2f67e6a52bef75fc7c56217a4c57c8136e4b27ace7ba49c520161c2f15a1a73035822244b321b0f6b15c0af9c67254076e6168b4cc8624334e81d SHA512 3c3b8a08d212c5f93e85577ea043107e6008ebd85631951cd7ed6767a22be2b807b87b1cfce3f13f66d936ea53cf1eb14a4c067d1f444d2cd7e35462bb1f27bc
 AUX protobuf.patch 8899 BLAKE2B c8d181250926a7b22aa67e17b1e38b9713c50578458452d02b9af89400d4194f31808563709cbfc81fdb4709ee57032fbb77d26ff413bc069a5dc0407a57146b SHA512 eb36f0000204788ad9fa40d8fcdc0fcb6fc8d27489c5bae3cc12e910a7046936ed1d6adc23b3498060ee6da380df5f238bde17b699b3c3b0eec9f1c75a6c07e9
 AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792
 DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390
 DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34
 EBUILD gazebo-11.13.0.ebuild 1893 BLAKE2B 01d3b523ca6342fea4be572679cbee959da6dbe89084680786ef5e0edb655f6fa3051e69aedfbfd0f929f41211447029b59021d31c22fe3ead1a07e803d57467 SHA512 e2f5973099b478942089d2863d2751ee7b47bf46db4ae0730cd3a765af3e484ef63c5c5df5d41c99eb32b47acf7775f6818cb70befad0e7a65c54bd27e6b75de
-EBUILD gazebo-11.14.0.ebuild 1863 BLAKE2B 447621561f05fd653b3d3a649d4621ebc57efaffd804d9a5df0d34aecf21b6b58661a2080a877c521580b48712b7cfeabdfce47cbefbfff9d000c1066a70880b SHA512 249321163614e181ea536d5f629b7a3e91eccd80bb52767d503bb6ebcd4bd60253aa430d415bee3886de180cdb9ba3516f6e8dd3dfcc7e3eb1fea9dddb5a8d24
+EBUILD gazebo-11.14.0.ebuild 1889 BLAKE2B 3a93b2d82c4b27fe9b96d69ab240e17527f6c6403a47bcb4adf358c7cd04120a1bf46c14d688999235e83c4c94dd6118350432a7fd45acd4edd4b4d166a2a345 SHA512 737f583f700b81958735c1b15ce62371a48ee581e7ccf7ad49ee9472469e0ed0e98e1a05044ceb87aa0df9d10d45824c17aa038339433dcfea928ac466e93914
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/files/gv10.patch b/sci-electronics/gazebo/files/gv10.patch
new file mode 100644
index 000000000000..f3ab5eb1e686
--- /dev/null
+++ b/sci-electronics/gazebo/files/gv10.patch
@@ -0,0 +1,45 @@
+From 660ae15f4af1f5ea8d9d50d4a24e4d91a94f9c2d Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Tue, 20 Feb 2024 17:25:23 -0800
+Subject: [PATCH] Fix build with graphviz 10.0
+
+Replace TRUE with 1, since the TRUE macro has been removed.
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/gui/qgv/QGVSubGraph.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gazebo/gui/qgv/QGVSubGraph.cpp b/gazebo/gui/qgv/QGVSubGraph.cpp
+index 51925aba30..c16b69d065 100644
+--- a/gazebo/gui/qgv/QGVSubGraph.cpp
++++ b/gazebo/gui/qgv/QGVSubGraph.cpp
+@@ -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 :"<<label;
+         return 0;
+     }
+-    agsubnode(_sgraph->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(const QString &_name, bool cluster)
+     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/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
index 0a321f61f496..1746085d2235 100644
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,6 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/gv10.patch"
 )
 
 src_configure() {