[freecad] 02/05: Work around Qt4 not being compatible with boost+gcc5. (Closes: #795069)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freecad.

commit 91ef5e97204b684472454d326219302984be568f
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Aug 12 20:32:51 2015 +0200

    Work around Qt4 not being compatible with boost+gcc5. (Closes: #795069)
---
 debian/patches/gcc5.patch | 102 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |   1 +
 2 files changed, 103 insertions(+)

diff --git a/debian/patches/gcc5.patch b/debian/patches/gcc5.patch
new file mode 100644
index 0000000..f13d36c
--- /dev/null
+++ b/debian/patches/gcc5.patch
@@ -0,0 +1,102 @@
+Index: freecad/src/Gui/ManualAlignment.h
+===================================================================
+--- freecad.orig/src/Gui/ManualAlignment.h
++++ freecad/src/Gui/ManualAlignment.h
+@@ -30,7 +30,9 @@
+ #include <Gui/Application.h>
+ #include <Gui/Document.h>
+ #include <Gui/ViewProviderDocumentObject.h>
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
++#endif
+ 
+ class SbVec3f;
+ class SoPickedPoint;
+Index: freecad/src/App/Application.h
+===================================================================
+--- freecad.orig/src/App/Application.h
++++ freecad/src/App/Application.h
+@@ -25,7 +25,9 @@
+ #ifndef APP_APPLICATION_H
+ #define APP_APPLICATION_H
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signal.hpp>
++#endif
+ 
+ #include <vector>
+ 
+Index: freecad/src/App/Document.h
+===================================================================
+--- freecad.orig/src/App/Document.h
++++ freecad/src/App/Document.h
+@@ -35,9 +35,10 @@
+ #include <vector>
+ #include <stack>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
+ #include <boost/graph/adjacency_list.hpp>
+-
++#endif
+ 
+ namespace Base {
+     class Writer;
+Index: freecad/src/App/DocumentObserver.h
+===================================================================
+--- freecad.orig/src/App/DocumentObserver.h
++++ freecad/src/App/DocumentObserver.h
+@@ -24,7 +24,9 @@
+ #ifndef APP_DOCUMENTOBSERVER_H
+ #define APP_DOCUMENTOBSERVER_H
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
++#endif
+ #include <set>
+ 
+ namespace App
+Index: freecad/src/App/DocumentObserverPython.h
+===================================================================
+--- freecad.orig/src/App/DocumentObserverPython.h
++++ freecad/src/App/DocumentObserverPython.h
+@@ -26,8 +26,10 @@
+ 
+ #include <CXX/Objects.hxx>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
+ #include <boost/bind.hpp>
++#endif
+ 
+ namespace App
+ {
+Index: freecad/src/Gui/MergeDocuments.h
+===================================================================
+--- freecad.orig/src/Gui/MergeDocuments.h
++++ freecad/src/Gui/MergeDocuments.h
+@@ -24,7 +24,9 @@
+ #ifndef GUI_MERGEDOCUMENTS_H
+ #define GUI_MERGEDOCUMENTS_H
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
++#endif
+ #include <Base/Persistence.h>
+ 
+ namespace zipios {
+Index: freecad/src/Gui/Placement.h
+===================================================================
+--- freecad.orig/src/Gui/Placement.h
++++ freecad/src/Gui/Placement.h
+@@ -28,8 +28,10 @@
+ #include <Gui/TaskView/TaskView.h>
+ #include <Base/Placement.h>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/signals.hpp>
+ #include <boost/bind.hpp>
++#endif
+ 
+ class QSignalMapper;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e067e40..febe488 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ disable_memory_check.patch
 unittest_to_stdout.patch
 fix_clang_compilation.patch
 0001-Disable-automatic-DXF-library-download.patch
+gcc5.patch

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