sci-electronics/gazebo: fix build with tinyxml2 4.0

Package-Manager: portage-2.3.0

diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch
new file mode 100644 (file)
index 0000000..b829201
--- /dev/null
+++ b/sci-electronics/gazebo/files/tinyxml2.patch
@@ -0,0 +1,22 @@
+Index: gazebo-7.3.1/gazebo/util/LogPlay.cc
+===================================================================
+--- gazebo-7.3.1.orig/gazebo/util/LogPlay.cc
++++ gazebo-7.3.1/gazebo/util/LogPlay.cc
+@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l
+ 
+   // Flag use to indicate if a parser failure has occurred
+   bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-    tinyxml2::XML_NO_ERROR;
++    tinyxml2::XML_SUCCESS;
+ 
+   // Parse the log file
+   if (xmlParserFail)
+@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l
+ 
+           // Retry loading the log file.
+           xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-            tinyxml2::XML_NO_ERROR;
++            tinyxml2::XML_SUCCESS;
+         }
+       }
+     }

diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
index c3b8b54a0534a01bbea52a77dac7922cee9fb508..cdc015cda205e60df74b54308c935f1e6cd6b968 100644 (file)
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}
        test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/tinyxml2.patch" )
 
 src_configure() {
        # doesnt build without it