From 3850571f38b8e1532c36e3d64296efadbd7e038e Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 28 Dec 2017 17:22:19 +0100 Subject: sci-electronics/gazebo: fix build with tinyxml2-6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- sci-electronics/gazebo/files/tinyxml6.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sci-electronics/gazebo/files/tinyxml6.patch (limited to 'sci-electronics/gazebo/files') diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch new file mode 100644 index 000000000000..16a3862fc78f --- /dev/null +++ b/sci-electronics/gazebo/files/tinyxml6.patch @@ -0,0 +1,20 @@ +Index: gazebo-8.2.0/gazebo/util/LogPlay.cc +=================================================================== +--- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc ++++ gazebo-8.2.0/gazebo/util/LogPlay.cc +@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l + { + gzerr << "Unable to load file[" << _logFile << "]. " + << "Check the Gazebo server log file for more information.\n"; +- const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1(); +- const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2(); +- if (errorStr1) +- gzlog << "Log Error 1:\n" << errorStr1 << std::endl; +- if (errorStr2) +- gzlog << "Log Error 2:\n" << errorStr2 << std::endl; ++ const char *errorStr = this->dataPtr->xmlDoc.ErrorStr(); ++ if (errorStr) ++ gzlog << "Log Error:\n" << errorStr << std::endl; + gzthrow("Error parsing log file"); + } + -- cgit v1.2.3-65-gdbad