From 6f825984db8deb9ecffe9af664291bfd64ecfbec Mon Sep 17 00:00:00 2001 From: David Spencer Date: Wed, 28 Nov 2018 20:20:15 +0000 Subject: libraries/gazebo: Fix build with tinyxml2-7.0.1. Signed-off-by: David Spencer --- libraries/gazebo/gazebo-tinyxml2.patch | 13 +++++++++++++ libraries/gazebo/gazebo.SlackBuild | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 libraries/gazebo/gazebo-tinyxml2.patch (limited to 'libraries/gazebo') diff --git a/libraries/gazebo/gazebo-tinyxml2.patch b/libraries/gazebo/gazebo-tinyxml2.patch new file mode 100644 index 0000000000..0e52a83259 --- /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 ddb7dbdc22..81884c1f13 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 \ -- cgit v1.2.3