diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2018-11-28 20:20:15 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-12-01 07:27:47 +0700 |
| commit | 6f825984db8deb9ecffe9af664291bfd64ecfbec (patch) | |
| tree | d9e835902aa34573f70432392c0bc752c94706e7 | |
| parent | 2e12dba0b218186ecaad7553607677be163d6c4b (diff) | |
libraries/gazebo: Fix build with tinyxml2-7.0.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | libraries/gazebo/gazebo-tinyxml2.patch | 13 | ||||
| -rw-r--r-- | libraries/gazebo/gazebo.SlackBuild | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/libraries/gazebo/gazebo-tinyxml2.patch b/libraries/gazebo/gazebo-tinyxml2.patch new file mode 100644 index 0000000000000..0e52a8325984b --- /dev/null +++ b/libraries/gazebo/gazebo-tinyxml2.patch @@ -0,0 +1,13 @@ +--- gazebo/util/LogPlay.cc 2017-06-09 03:51:31.000000000 +0100 ++++ gazebo/util/LogPlay.cc.new 2018-02-12 16:52:06.382230361 +0000 +@@ -118,8 +118,8 @@ + { + 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(); ++ const char *errorStr1 = this->dataPtr->xmlDoc.ErrorStr(); ++ const char *errorStr2 = this->dataPtr->xmlDoc.ErrorStr(); + if (errorStr1) + gzlog << "Log Error 1:\n" << errorStr1 << std::endl; + if (errorStr2) diff --git a/libraries/gazebo/gazebo.SlackBuild b/libraries/gazebo/gazebo.SlackBuild index ddb7dbdc2271f..81884c1f13636 100644 --- a/libraries/gazebo/gazebo.SlackBuild +++ b/libraries/gazebo/gazebo.SlackBuild @@ -76,6 +76,10 @@ sed -i -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" cmake/gazebo-config.cmake.in # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835427 sed -i -e 's/XML_NO_ERROR/XML_SUCCESS/g' gazebo/util/LogPlay.cc +# Fix build failure with tinyxml2-7.0.1 +# https://github.com/ros/ros-overlay/issues/323 +patch -p0 < $CWD/gazebo-tinyxml2.patch + mkdir -p build cd build cmake \ |