| 1 |
commit: 3b77a1b7737e4cad76736127140215a203a253c4 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 4 12:48:56 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 12:49:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b77a1b7 |
| 7 |
|
| 8 |
sci-electronics/gazebo: fix build with tinyxml2 4.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sci-electronics/gazebo/files/tinyxml2.patch | 22 ++++++++++++++++++++++ |
| 13 |
sci-electronics/gazebo/gazebo-7.3.1.ebuild | 1 + |
| 14 |
2 files changed, 23 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..b829201 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-electronics/gazebo/files/tinyxml2.patch |
| 21 |
@@ -0,0 +1,22 @@ |
| 22 |
+Index: gazebo-7.3.1/gazebo/util/LogPlay.cc |
| 23 |
+=================================================================== |
| 24 |
+--- gazebo-7.3.1.orig/gazebo/util/LogPlay.cc |
| 25 |
++++ gazebo-7.3.1/gazebo/util/LogPlay.cc |
| 26 |
+@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l |
| 27 |
+ |
| 28 |
+ // Flag use to indicate if a parser failure has occurred |
| 29 |
+ bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != |
| 30 |
+- tinyxml2::XML_NO_ERROR; |
| 31 |
++ tinyxml2::XML_SUCCESS; |
| 32 |
+ |
| 33 |
+ // Parse the log file |
| 34 |
+ if (xmlParserFail) |
| 35 |
+@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l |
| 36 |
+ |
| 37 |
+ // Retry loading the log file. |
| 38 |
+ xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != |
| 39 |
+- tinyxml2::XML_NO_ERROR; |
| 40 |
++ tinyxml2::XML_SUCCESS; |
| 41 |
+ } |
| 42 |
+ } |
| 43 |
+ } |
| 44 |
|
| 45 |
diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild |
| 46 |
index c3b8b54..cdc015c 100644 |
| 47 |
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild |
| 48 |
+++ b/sci-electronics/gazebo/gazebo-7.3.1.ebuild |
| 49 |
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND} |
| 50 |
test? ( dev-libs/libxslt ) |
| 51 |
" |
| 52 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
| 53 |
+PATCHES=( "${FILESDIR}/tinyxml2.patch" ) |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
# doesnt build without it |
Archives