Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/
On 03/09/16 06:05, Graham Inggs wrote: This comes from protobuf 3. I found it has already been fixed in git [1], although the patch description is incorrect. Regards Graham [1] https://anonscm.debian.org/cgit/debian-science/packages/gazebo.git/commit/?id=d033bbf3218580638e35b8df13565099a5c7c8db Any eta on an upload? is something blocking one?
Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/
Hi Peter On 2 September 2016 at 23:15, Peter Green wrote: > Unfortunately while that patch fixed the FTBFS in raspbian stretch at the > time the package is now failing for us for a different reason. While I saw > this in raspbian I have no reason to belive it is raspbian specific. > > > In file included from /usr/include/spnav.h:33:0, > from > /<>/gazebo-7.3.0+dfsg/gazebo/gui/SpaceNav.cc:27: > /usr/include/google/protobuf/stubs/logging.h:66:7: error: expected > identifier before 'int' > class Status; >^ > /usr/include/google/protobuf/stubs/logging.h:66:7: error: multiple types in > one declaration This comes from protobuf 3. I found it has already been fixed in git [1], although the patch description is incorrect. Regards Graham [1] https://anonscm.debian.org/cgit/debian-science/packages/gazebo.git/commit/?id=d033bbf3218580638e35b8df13565099a5c7c8db
Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/
On 29/08/16 15:45, Peter Michael Green wrote: tags 835427 +patch thanks Older versions of tinyxml defined both XML_NO_ERROR and XML_SUCCESS to 0. Never versions define only XML_SUCCESS. Attatched is a patch that replaces XML_NO_ERROR with XML_SUCCESS Unfortunately while that patch fixed the FTBFS in raspbian stretch at the time the package is now failing for us for a different reason. While I saw this in raspbian I have no reason to belive it is raspbian specific. In file included from /usr/include/spnav.h:33:0, from /<>/gazebo-7.3.0+dfsg/gazebo/gui/SpaceNav.cc:27: /usr/include/google/protobuf/stubs/logging.h:66:7: error: expected identifier before 'int' class Status; ^ /usr/include/google/protobuf/stubs/logging.h:66:7: error: multiple types in one declaration In file included from /usr/include/google/protobuf/stubs/common.h:45:0, from /usr/include/google/protobuf/stubs/atomicops.h:59, from /usr/include/google/protobuf/stubs/atomic_sequence_num.h:33, from /usr/include/google/protobuf/arena.h:52, from /usr/include/google/protobuf/message.h:118, from /<>/gazebo-7.3.0+dfsg/gazebo/transport/CallbackHelper.hh:20, from /<>/gazebo-7.3.0+dfsg/obj-arm-linux-gnueabihf/gazebo/transport/transport.hh:2, from /<>/gazebo-7.3.0+dfsg/gazebo/gui/SpaceNavPrivate.hh:23, from /<>/gazebo-7.3.0+dfsg/gazebo/gui/SpaceNav.cc:31: /usr/include/google/protobuf/stubs/logging.h:90:32: error: expected ')' before '::' token LogMessage& operator<<(const ::google::protobuf::util::Status& status); ^~ /usr/include/google/protobuf/stubs/logging.h:90:32: error: 'google::protobuf::internal::LogMessage& google::protobuf::internal::LogMessage::operator<<(...)' must not have variable number of arguments /usr/include/google/protobuf/stubs/logging.h:90:26: error: expected ';' at end of member declaration LogMessage& operator<<(const ::google::protobuf::util::Status& status); ^ In file included from /usr/include/spnav.h:33:0, from /<>/gazebo-7.3.0+dfsg/gazebo/gui/SpaceNav.cc:27: /usr/include/google/protobuf/stubs/logging.h:90:58: error: expected unqualified-id before 'int' LogMessage& operator<<(const ::google::protobuf::util::Status& status); ^ gazebo/gui/CMakeFiles/gazebo_gui.dir/build.make:1194: recipe for target 'gazebo/gui/CMakeFiles/gazebo_gui.dir/SpaceNav.cc.o' failed http://buildd.raspbian.org/status/fetch.php?pkg=gazebo&arch=armhf&ver=7.3.0%2Bdfsg-2%2Brpi1%2Bb1&stamp=1472782288 I'm guessing some sort of header conflict, I will try to take a look but not promising anything. Ideas welcome.
Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/
tags 835427 +patch thanks Older versions of tinyxml defined both XML_NO_ERROR and XML_SUCCESS to 0. Never versions define only XML_SUCCESS. Attatched is a patch that replaces XML_NO_ERROR with XML_SUCCESS diff -Nru gazebo-7.3.0+dfsg/debian/changelog gazebo-7.3.0+dfsg/debian/changelog --- gazebo-7.3.0+dfsg/debian/changelog 2016-07-21 15:33:10.0 + +++ gazebo-7.3.0+dfsg/debian/changelog 2016-08-27 16:02:33.0 + @@ -1,3 +1,9 @@ +gazebo (7.3.0+dfsg-2+rpi1) stretch-staging; urgency=medium + + * Change XML_NO_ERROR to XML_SUCCESS (Closes: 835427) + + -- Peter Michael Green Sat, 27 Aug 2016 16:02:33 + + gazebo (7.3.0+dfsg-2) unstable; urgency=medium * Patch to fix linking with gcc6 (Closes: #831176) diff -Nru gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch --- gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch1970-01-01 00:00:00.0 + +++ gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch2016-08-27 16:02:33.0 + @@ -0,0 +1,24 @@ +Description: Change XML_NO_ERROR to XML_SUCCESS (Closes: 835427) +Author: Peter Michael Green +Bug-Debian: https://bugs.debian.org/835427 + +--- gazebo-7.3.0+dfsg.orig/gazebo/util/LogPlay.cc gazebo-7.3.0+dfsg/gazebo/util/LogPlay.cc +@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l + + // Flag use to indicate if a parser failure has occurred + bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != +-tinyxml2::XML_NO_ERROR; ++tinyxml2::XML_SUCCESS; + + // Parse the log file + if (xmlParserFail) +@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l + + // Retry loading the log file. + xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != +-tinyxml2::XML_NO_ERROR; ++tinyxml2::XML_SUCCESS; + } + } + } diff -Nru gazebo-7.3.0+dfsg/debian/patches/series gazebo-7.3.0+dfsg/debian/patches/series --- gazebo-7.3.0+dfsg/debian/patches/series 2016-07-21 15:35:01.0 + +++ gazebo-7.3.0+dfsg/debian/patches/series 2016-08-27 16:02:33.0 + @@ -2,3 +2,4 @@ 0005-fix-problems-on-manpage.patch 0008-arial-font-removed-in-dfsg.patch 0009-fix-gcc6-linking.patch +0010-xml-no-error.patch
Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/
Older versions of tinyxml defined both XML_NO_ERROR and XML_SUCCESS to 0. Never versions define only XML_SUCCESS.
