[gazebo] 01/01: Fix the double declaration of Status

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit d033bbf3218580638e35b8df13565099a5c7c8db
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Aug 31 17:57:23 2016 +0000

    Fix the double declaration of Status
---
 .../patches/0004-fix-status-double-declaration.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0004-fix-status-double-declaration.patch b/debian/patches/0004-fix-status-double-declaration.patch
new file mode 100644
index 0000000..f63cf70
--- /dev/null
+++ b/debian/patches/0004-fix-status-double-declaration.patch
@@ -0,0 +1,20 @@
+Description: Use new tinyxml constant
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: https://bitbucket.org/osrf/gazebo/pull-requests/2435
+Last-Update: 2016-08-31
+
+diff --git a/gazebo/gui/SpaceNav.cc b/gazebo/gui/SpaceNav.cc
+index e0d9ed2..745288d 100644
+--- a/gazebo/gui/SpaceNav.cc
++++ b/gazebo/gui/SpaceNav.cc
+@@ -25,6 +25,10 @@
+ #include <gazebo/gazebo_config.h>
+ #ifdef HAVE_SPNAV
+ #include <spnav.h>
++// Status is defined in X11/Xlib.h which is included by spnav.h
++// protobuf define a class named Status. To avoid conflicts, remove here
++// the definition of Status.
++#undef Status
+ #endif
+ 
+ #include "gazebo/gui/GuiIface.hh"
diff --git a/debian/patches/series b/debian/patches/series
index 702cf99..0d8aa47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0008-arial-font-removed-in-dfsg.patch
 0009-fix-gcc6-linking.patch
 0001-fix_tinyxml_constant.patch
+0004-fix-status-double-declaration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git