mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-electronics/gazebo: fix build with tinyxml2-6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
20
sci-electronics/gazebo/files/tinyxml6.patch
Normal file
20
sci-electronics/gazebo/files/tinyxml6.patch
Normal file
@@ -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");
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ RDEPEND="
|
||||
media-libs/openal
|
||||
net-misc/curl
|
||||
dev-libs/tinyxml
|
||||
dev-libs/tinyxml2:=
|
||||
>=dev-libs/tinyxml2-6:=
|
||||
dev-libs/libtar
|
||||
dev-cpp/tbb
|
||||
>=dev-games/ogre-1.7.4[freeimage]
|
||||
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
|
||||
test? ( dev-libs/libxslt )
|
||||
"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
PATCHES=( "${FILESDIR}/qwt.patch" )
|
||||
PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tinyxml6.patch" )
|
||||
|
||||
src_configure() {
|
||||
# doesnt build without it
|
||||
|
||||
Reference in New Issue
Block a user