diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-08-04 14:48:56 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-08-04 14:49:03 +0200 |
| commit | 3b77a1b7737e4cad76736127140215a203a253c4 (patch) | |
| tree | 95a966a09abb0f3598c938945874c57afd1fff67 | |
| parent | dev-util/cppcheck: Restrict >=dev-libs/tinyxml2-4 (bug 590428). (diff) | |
| download | gentoo-3b77a1b7737e4cad76736127140215a203a253c4.tar.gz gentoo-3b77a1b7737e4cad76736127140215a203a253c4.tar.bz2 gentoo-3b77a1b7737e4cad76736127140215a203a253c4.zip | |
sci-electronics/gazebo: fix build with tinyxml2 4.0
Package-Manager: portage-2.3.0
| -rw-r--r-- | sci-electronics/gazebo/files/tinyxml2.patch | 22 | ||||
| -rw-r--r-- | sci-electronics/gazebo/gazebo-7.3.1.ebuild | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch new file mode 100644 index 000000000000..b829201f4905 --- /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 c3b8b54a0534..cdc015cda205 100644 --- 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 |