From 76dfef0cec9170000357d2f354e412daf48941fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Dec 2017 01:11:30 +0000 Subject: gentoo resync : 30.12.2017 --- sci-electronics/gazebo/Manifest | 3 ++- sci-electronics/gazebo/files/tinyxml6.patch | 20 ++++++++++++++++++++ sci-electronics/gazebo/gazebo-8.2.0.ebuild | 4 ++-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 sci-electronics/gazebo/files/tinyxml6.patch (limited to 'sci-electronics/gazebo') diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 166df33051b2..beeb8e4b3c19 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,6 +1,7 @@ AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b +AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6 DIST gazebo-8.1.1.tar.bz2 52448136 BLAKE2B 39972762d2e5bbf81a02481d8b2f07bd6b3c6926670cf578cd26fce92060dbfa359a5d5362d6391ab051bd3f054da5a6af137a61179aeb7815a95ef4cf7329ce SHA512 bf5585e63cfb5a86b89a0e802c33ff07c5753e94b9282610d2ea1a4248af705a1c80ea52389b4a7c49f51ec1990e2c9a5e3a6a74fefebe1b20e70960ceb755e8 DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843 EBUILD gazebo-8.1.1.ebuild 1835 BLAKE2B 6b0d5c4b30f86a8e381409140f6bfa1b500c8fb26685e10c309f18230e7aa8fd00d52d471cb33eb15a4af664b8d68174001a9b8330b749a514923b45d2408485 SHA512 f4656e7ed7fd4d0fbadb0a3cb0837149252d2c18b11cc3450dd950d5fb5eec4abd500682912bc70a16d31af727ba31f5d8c263cd37f3727b42e1a351c0c3b149 -EBUILD gazebo-8.2.0.ebuild 1837 BLAKE2B acfcaed2540ef8cbf0925d524cb568ad2a20645708554233c26e3f261d0d99f51ccd82ebbbd1c19ae2bcdbd55944d01defa39c783356fad31e6cd39e8279e655 SHA512 d03cb408fd244d8ee1b06e2c87ab69df20432a58f4761eea95f6d4aea8df6e04473394db1905730efa4dd969b12af98fa58c88acfa4361918cb6c16dffc382eb +EBUILD gazebo-8.2.0.ebuild 1870 BLAKE2B 5c1f2c703c85389ff2fdf94433112c1c659a09a50b61d1605512f1e3bc7fbfc6f4cc997f72c920a678469412257159475a28d35fc58e3c3be172d24ea4773b18 SHA512 b5fd31c98243d41aae94f75ed7ed037a25330a56481d316417330dfd7ec8501abe9258c80afbce28b449499b2e5e197e131d2c8189ad9202f2f2326143d6ac2d MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c 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"); + } + diff --git a/sci-electronics/gazebo/gazebo-8.2.0.ebuild b/sci-electronics/gazebo/gazebo-8.2.0.ebuild index 923dd8c7c2f2..04696aa2fb5f 100644 --- a/sci-electronics/gazebo/gazebo-8.2.0.ebuild +++ b/sci-electronics/gazebo/gazebo-8.2.0.ebuild @@ -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 -- cgit v1.2.3