[gazebo] 01/02: Add patch for Q_MOC_RUN

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository gazebo.

commit a492f9bcd543d6b7c1934623b99bb3408d22a409
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 24 23:53:20 2017 +0100

    Add patch for Q_MOC_RUN
    
    Closes: #882591
---
 ...Add-Q_MOC_RUN-to-work-around-syntax-error.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0005-Add-Q_MOC_RUN-to-work-around-syntax-error.patch b/debian/patches/0005-Add-Q_MOC_RUN-to-work-around-syntax-error.patch
new file mode 100644
index 0000000..491504e
--- /dev/null
+++ b/debian/patches/0005-Add-Q_MOC_RUN-to-work-around-syntax-error.patch
@@ -0,0 +1,38 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 24 Nov 2017 23:52:10 +0100
+Subject: Add Q_MOC_RUN to work around syntax error
+
+---
+ gazebo/common/SystemPaths.hh | 2 ++
+ gazebo/math/Helpers.hh       | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh
+index 2196b0b..5cf805f 100644
+--- a/gazebo/common/SystemPaths.hh
++++ b/gazebo/common/SystemPaths.hh
+@@ -28,7 +28,9 @@
+   #define GetCurrentDir getcwd
+ #endif
+ 
++#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+ #include <boost/filesystem.hpp>
++#endif
+ #include <list>
+ #include <string>
+ 
+diff --git a/gazebo/math/Helpers.hh b/gazebo/math/Helpers.hh
+index 9e8e092..e9fdb59 100644
+--- a/gazebo/math/Helpers.hh
++++ b/gazebo/math/Helpers.hh
+@@ -17,8 +17,10 @@
+ #ifndef _GAZEBO_MATH_FUNCTIONS_HH_
+ #define _GAZEBO_MATH_FUNCTIONS_HH_
+ 
++#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+ #include <boost/math/special_functions/fpclassify.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#endif
+ #include <algorithm>
+ #include <cmath>
+ #include <limits>
diff --git a/debian/patches/series b/debian/patches/series
index 4ae4b59..15b7108 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch
 strlen.patch
+0005-Add-Q_MOC_RUN-to-work-around-syntax-error.patch

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