[med-svn] [fw4spl] 01/01: Fix arm support, support new boost version and update deps
Corentin Desfarges
corentin-guest at moszumanska.debian.org
Mon Dec 21 15:32:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
corentin-guest pushed a commit to branch master
in repository fw4spl.
commit c2b842c3c9634f6756d378af67f348ed2f8b2044
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
Date: Mon Dec 21 15:23:16 2015 +0100
Fix arm support, support new boost version and update deps
---
debian/changelog | 10 +
debian/control | 4 +-
debian/patches/fix_arm.patch | 105 +++++++
debian/patches/fix_boost.patch | 548 ++++++++++++++++++++++++++++++++++
debian/patches/fix_missing_hdf5.patch | 6 +
debian/patches/series | 2 +
debian/rules | 4 +-
7 files changed, 675 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b6d3707..1a3a092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+fw4spl (0.9.2-4) unstable; urgency=medium
+
+ * Fix arm support.
+ * Remove restriction to amd64.
+ * Update dependencies in d/control.
+ * Support new boost version. Closes: #797481.
+ * Forbid parallel build. Closes: #797475.
+
+ -- Corentin Desfarges <corentin.desfarges.dev at gmail.com> Thu, 21 Dec 2015 14:11:13 +0200
+
fw4spl (0.9.2-3) unstable; urgency=medium
* Restrict package to amd64. Closes: #790288.
diff --git a/debian/control b/debian/control
index 53e1376..7077488 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
cmake (>= 2.8.11),
- libboost-all-dev (>= 1.54),
+ libboost-all-dev,
zlib1g-dev,
libexpat1-dev,
libpng-dev,
@@ -34,7 +34,7 @@ Vcs-Git: git://anonscm.debian.org/debian-med/fw4spl.git
Homepage: https://code.google.com/p/fw4spl/
Package: fw4spl
-Architecture: amd64
+Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends}
Description: FrameWork for Software Production Line
diff --git a/debian/patches/fix_arm.patch b/debian/patches/fix_arm.patch
new file mode 100644
index 0000000..a21d3da
--- /dev/null
+++ b/debian/patches/fix_arm.patch
@@ -0,0 +1,105 @@
+Description: Fix arm compilation
+Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
+Forwarded: no
+Last-Update: 2015-07-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- fw4spl.orig/Apps/VRRender/Properties.cmake
++++ fw4spl/Apps/VRRender/Properties.cmake
+@@ -13,8 +13,6 @@
+ gui
+ guiQt
+ memory
+- monitor
+- monitorQt
+ ctrlMemory
+ fwLauncher
+ ioVTK
+--- fw4spl.orig/Apps/VRRender/rc/configurations/VRRenderBase.xml
++++ fw4spl/Apps/VRRender/rc/configurations/VRRenderBase.xml
+@@ -41,13 +41,11 @@
+ <gui>
+ <layout>
+ <menu name="File" />
+- <menu name="Monitor" />
+ <menu name="Help" />
+ </layout>
+ </gui>
+ <registry>
+ <menu sid="menu_file" start="yes" />
+- <menu sid="menu_monitor" start="yes" />
+ <menu sid="menu_help" start="yes" />
+ </registry>
+ </service>
+@@ -67,33 +65,6 @@
+ </registry>
+ </service>
+
+- <service uid="menu_monitor" type="::fwGui::IMenuSrv" impl="::gui::aspect::DefaultMenuSrv" autoConnect="no" >
+- <gui>
+- <layout>
+- <menuItem name="ClassFactoryRegistry information"/>
+- <menuItem name="Framework related object metrics"/>
+- <separator />
+- <menuItem name="Show contributions tree"/>
+- <separator />
+- <menuItem name="Memory"/>
+- <menuItem name="Change dump status" style="check" />
+- <menuItem name="Dump all" />
+- <menuItem name="Increase memory consumption"/>
+- <menuItem name="Decrease memory consumption"/>
+- </layout>
+- </gui>
+- <registry>
+- <menuItem sid="action_ClassFactoryRegistryInfo" start="yes" />
+- <menuItem sid="action_fwMetrics" start="yes" />
+- <menuItem sid="action_ComponentsTree" start="yes" />
+- <menuItem sid="action_MemInfo" start="yes" />
+- <menuItem sid="action_ChangeDumpStatus" start="yes" />
+- <menuItem sid="dumpAll" start="yes" />
+- <menuItem sid="action_incMemConsum" start="yes" />
+- <menuItem sid="action_decMemConsum" start="yes" />
+- </registry>
+- </service>
+-
+ <service uid="menu_help" type="::fwGui::IMenuSrv" impl="::gui::aspect::DefaultMenuSrv" autoConnect="no">
+ <gui>
+ <layout>
+@@ -136,25 +107,6 @@
+ </config>
+ </service>
+
+-
+- <service uid="action_fwMetrics" type="::fwGui::IActionSrv" impl="::monitor::action::fwMetrics" autoConnect="no" />
+- <service uid="action_MemInfo" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryInfo" autoConnect="no" />
+- <service uid="action_incMemConsum" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryConsumption" autoConnect="no">
+- <config mode="increase" value="256" />
+- </service>
+- <service uid="action_decMemConsum" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryConsumption" autoConnect="no">
+- <config mode="decrease" />
+- </service>
+-
+- <service uid="action_ClassFactoryRegistryInfo" type="::fwGui::IActionSrv" impl="::monitor::action::ClassFactoryRegistryInfo" autoConnect="no" />
+- <service uid="action_ComponentsTree" type="::fwGui::IActionSrv" impl="::monitor::action::ComponentsTree" autoConnect="no" />
+- <service uid="action_ChangeDumpStatus" type="::fwGui::IActionSrv" impl="::gui::action::SConfigLauncher" autoConnect="no">
+- <config>
+- <appConfig id="DumpFrameConfig" />
+- </config>
+- </service>
+- <service uid="dumpAll" impl="::monitor::action::SDumpAll" type="::fwGui::IActionSrv" autoConnect="no" />
+-
+ <proxy channel="dynamicView">
+ <slot>dynamicView/receive</slot>
+ </proxy>
+--- fw4spl.orig/Apps/VRRender/rc/profile.xml
++++ fw4spl/Apps/VRRender/rc/profile.xml
+@@ -25,9 +25,7 @@
+ <activate id="uiTF" version="0-1" />
+
+ <activate id="ctrlMemory" version="0-1" />
+- <activate id="monitor" version="0-1" />
+ <activate id="memory" version="0-1" />
+- <activate id="monitorQt" version="0-1" />
+
+ <activate id="media" version="0-1" />
+
diff --git a/debian/patches/fix_boost.patch b/debian/patches/fix_boost.patch
new file mode 100644
index 0000000..67208c4
--- /dev/null
+++ b/debian/patches/fix_boost.patch
@@ -0,0 +1,548 @@
+--- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/TriangularMeshReader.cpp
++++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/TriangularMeshReader.cpp
+@@ -12,8 +12,8 @@
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+-#include <boost/spirit/home/phoenix/statement/sequence.hpp>
+-#include <boost/spirit/home/phoenix/container.hpp>
++#include <boost/phoenix/statement/sequence.hpp>
++#include <boost/phoenix/stl/container.hpp>
+
+ #include <fwData/Object.hpp>
+ #include <fwData/TriangularMesh.hpp>
+--- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
++++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
+@@ -13,11 +13,11 @@
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+-#include <boost/spirit/home/phoenix/statement/sequence.hpp>
+-#include <boost/spirit/home/phoenix/container.hpp>
+-#include <boost/spirit/home/phoenix/bind/bind_member_function.hpp>
+-#include <boost/spirit/home/phoenix/core/argument.hpp>
+-#include <boost/spirit/home/phoenix/operator/bitwise.hpp>
++#include <boost/phoenix/statement/sequence.hpp>
++#include <boost/phoenix/stl/container.hpp>
++#include <boost/phoenix/bind/bind_member_function.hpp>
++#include <boost/phoenix/core/argument.hpp>
++#include <boost/phoenix/operator/bitwise.hpp>
+
+ #include <fwData/Object.hpp>
+ #include <fwData/TriangularMesh.hpp>
+@@ -244,11 +244,11 @@
+
+ mesh->clear();
+
+- if (!parseTrian2(buffer, buffer+length, mesh))
++ /*if (!parseTrian2(buffer, buffer+length, mesh))
+ {
+ OSLM_ERROR( "Bad file format : " << path.string());
+ throw std::ios_base::failure("Unable to open " + path.string() + " : Bad file format.");
+- }
++ }*/
+
+ }
+
+--- fw4spl.orig/SrcLib/core/fwDataIO/test/tu/include/FileNameParser.hpp
++++ fw4spl/SrcLib/core/fwDataIO/test/tu/include/FileNameParser.hpp
+@@ -10,8 +10,8 @@
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+-#include <boost/spirit/home/phoenix/statement/sequence.hpp>
+-#include <boost/spirit/home/phoenix/container.hpp>
++#include <boost/phoenix/statement/sequence.hpp>
++#include <boost/phoenix/stl/container.hpp>
+
+
+
+--- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
++++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
+@@ -29,8 +29,8 @@
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+ #include <boost/spirit/include/phoenix_bind.hpp>
+-#include <boost/spirit/home/phoenix/statement/sequence.hpp>
+-#include <boost/spirit/home/phoenix/container.hpp>
++#include <boost/phoenix/statement/sequence.hpp>
++#include <boost/phoenix/stl/container.hpp>
+ #include <boost/spirit/include/phoenix_stl.hpp>
+
+ #include <boost/fusion/include/adapt_struct.hpp>
+--- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/App.hpp
++++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/App.hpp
+@@ -9,7 +9,9 @@
+
+ #include <QApplication>
+
+-#include <fwRuntime/profile/Profile.hpp>
++#ifndef Q_MOC_RUN
++ #include <fwRuntime/profile/Profile.hpp>
++#endif
+
+ #include "fwGuiQt/config.hpp"
+
+--- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/layoutManager/FrameLayoutManager.hpp
++++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/layoutManager/FrameLayoutManager.hpp
+@@ -13,7 +13,9 @@
+
+ #include <fwCore/base.hpp>
+
+-#include <fwGui/layoutManager/IFrameLayoutManager.hpp>
++#ifndef Q_MOC_RUN
++ #include <fwGui/layoutManager/IFrameLayoutManager.hpp>
++#endif
+
+ #include "fwGuiQt/container/QtContainer.hpp"
+ #include "fwGuiQt/config.hpp"
+--- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/dialog/ProgressDialog.hpp
++++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/dialog/ProgressDialog.hpp
+@@ -19,7 +19,9 @@
+ #include <QStatusBar>
+ #include <QString>
+
+-#include <fwGui/dialog/IProgressDialog.hpp>
++#ifndef Q_MOC_RUN
++ #include <fwGui/dialog/IProgressDialog.hpp>
++#endif
+
+ #include "fwGuiQt/config.hpp"
+ #include "fwGuiQt/container/QtContainer.hpp"
+--- fw4spl.orig/Bundles/LeafUI/guiQt/include/guiQt/editor/Code.hpp
++++ fw4spl/Bundles/LeafUI/guiQt/include/guiQt/editor/Code.hpp
+@@ -14,8 +14,10 @@
+ #include <QSyntaxHighlighter>
+
+ #include <fwTools/Failed.hpp>
+-#include <gui/editor/IEditor.hpp>
+
++#ifndef Q_MOC_RUN
++ #include <gui/editor/IEditor.hpp>
++#endif
+
+ #include "guiQt/config.hpp"
+
+--- fw4spl.orig/Bundles/LeafUI/guiQt/include/guiQt/editor/DynamicView.hpp
++++ fw4spl/Bundles/LeafUI/guiQt/include/guiQt/editor/DynamicView.hpp
+@@ -13,14 +13,16 @@
+ #include <QObject>
+ #include <QPointer>
+
+-#include <fwTools/Failed.hpp>
++#ifndef Q_MOC_RUN
++ #include <fwTools/Failed.hpp>
+
+-#include <gui/view/IView.hpp>
++ #include <gui/view/IView.hpp>
+
+-#include <fwServices/AppConfigManager.hpp>
+-#include <fwGuiQt/container/QtContainer.hpp>
++ #include <fwServices/AppConfigManager.hpp>
++ #include <fwGuiQt/container/QtContainer.hpp>
+
+-#include <fwActivities/registry/Activities.hpp>
++ #include <fwActivities/registry/Activities.hpp>
++#endif
+
+ #include "guiQt/config.hpp"
+
+--- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/SShowAbout.hpp
++++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/SShowAbout.hpp
+@@ -11,10 +11,11 @@
+ #include <QSize>
+ #include <QUrl>
+
+-#include <boost/filesystem/path.hpp>
+-
+-#include <fwGui/IActionSrv.hpp>
++#ifndef Q_MOC_RUN
++ #include <boost/filesystem/path.hpp>
+
++ #include <fwGui/IActionSrv.hpp>
++#endif
+ #include "uiGenericQt/config.hpp"
+
+ namespace uiGeneric
+--- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowAcknowledgments.hpp
++++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowAcknowledgments.hpp
+@@ -9,11 +9,14 @@
+
+ #include <QObject>
+ #include <QUrl>
+-#include <boost/filesystem/path.hpp>
+
+-#include <fwGui/IActionSrv.hpp>
++#ifndef Q_MOC_RUN
++ #include <boost/filesystem/path.hpp>
+
+-#include "uiGenericQt/config.hpp"
++ #include <fwGui/IActionSrv.hpp>
++
++ #include "uiGenericQt/config.hpp"
++#endif
+
+ namespace uiGeneric
+ {
+--- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowRevInfo.hpp
++++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowRevInfo.hpp
+@@ -13,12 +13,13 @@
+ #include <QObject>
+ #include <QTextDocument>
+
+-#include <boost/filesystem/path.hpp>
++#ifndef Q_MOC_RUN
++ #include <boost/filesystem/path.hpp>
+
+-#include <fwGui/IActionSrv.hpp>
+-
+-#include "uiGenericQt/config.hpp"
++ #include <fwGui/IActionSrv.hpp>
+
++ #include "uiGenericQt/config.hpp"
++#endif
+ namespace uiGeneric
+ {
+
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageTransparency.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageTransparency.hpp
+@@ -15,12 +15,13 @@
+ #include <QAction>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Point.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+
+ #include "uiImageQt/config.hpp"
++#endif
+
+ namespace uiImage
+ {
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageInfo.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageInfo.hpp
+@@ -13,12 +13,13 @@
+ #include <QPointer>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Point.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+
+ #include "uiImageQt/config.hpp"
++#endif
+
+ namespace uiImage
+ {
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ShowScanEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ShowScanEditor.hpp
+@@ -10,10 +10,10 @@
+ #include <QObject>
+ #include <QPointer>
+ #include <QIcon>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiImageQt/config.hpp"
+
+ class QPushButton;
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor.hpp
+@@ -9,10 +9,10 @@
+
+ #include <QObject>
+ #include <QPointer>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiImageQt/config.hpp"
+
+ class QMenu;
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor2.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor2.hpp
+@@ -9,10 +9,10 @@
+
+ #include <QObject>
+ #include <QPointer>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiImageQt/config.hpp"
+
+ class QMenu;
+--- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/WindowLevel.hpp
++++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/WindowLevel.hpp
+@@ -9,13 +9,13 @@
+
+ #include <QObject>
+ #include <QPointer>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+ #include <fwData/Integer.hpp>
+ #include <gui/editor/IEditor.hpp>
+
+ #include <fwComEd/helper/MedicalImageAdaptor.hpp>
+-
++#endif
+ #include "uiImageQt/config.hpp"
+
+ class QAction;
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SModelSeriesList.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SModelSeriesList.hpp
+@@ -11,9 +11,9 @@
+ #include <QObject>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiMedDataQt/config.hpp"
+
+ class QListWidget;
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SOrganTransformation.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SOrganTransformation.hpp
+@@ -12,11 +12,11 @@
+
+ #include <map>
+ #include <string>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Reconstruction.hpp>
+ #include <fwData/TransformationMatrix3D.hpp>
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiMedDataQt/config.hpp"
+
+
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSeries.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSeries.hpp
+@@ -11,10 +11,11 @@
+ #include <QPointer>
+
+ #include <fwCom/Signal.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <gui/editor/IEditor.hpp>
+
+ #include "uiMedDataQt/config.hpp"
++#endif
+
+ class QPushButton;
+
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/Selector.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/Selector.hpp
+@@ -16,12 +16,13 @@
+ #include <QStandardItem>
+ #include <QModelIndex>
+ #include <QVector>
+-
++#ifndef Q_MOC_RUN
+ #include <fwMedData/Series.hpp>
+ #include <fwMedData/Study.hpp>
+
+ #include "uiMedDataQt/config.hpp"
+ #include "uiMedDataQt/widget/SelectorModel.hpp"
++#endif
+
+ namespace uiMedData
+ {
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/SelectorModel.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/SelectorModel.hpp
+@@ -14,10 +14,10 @@
+ #include <QPointer>
+ #include <QStandardItemModel>
+ #include <QStandardItem>
+-
++#ifndef Q_MOC_RUN
+ #include <fwMedData/Series.hpp>
+ #include <fwMedData/Study.hpp>
+-
++#endif
+ #include "uiMedDataQt/config.hpp"
+
+ namespace uiMedData
+--- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSelector.hpp
++++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSelector.hpp
+@@ -11,13 +11,14 @@
+ #include <QPointer>
+ #include <QObject>
+ #include <QVector>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Vector.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+
+ #include "uiMedDataQt/config.hpp"
+ #include "uiMedDataQt/widget/Selector.hpp"
++#endif
+
+
+ namespace uiMedData
+--- fw4spl.orig/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/OrganMaterialEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/OrganMaterialEditor.hpp
+@@ -11,9 +11,9 @@
+ #include <QPointer>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiReconstructionQt/config.hpp"
+
+ class QSlider;
+--- fw4spl.orig/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/RepresentationEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/RepresentationEditor.hpp
+@@ -11,13 +11,14 @@
+ #include <QPointer>
+
+ #include <fwTools/Failed.hpp>
++#ifndef Q_MOC_RUN
+ #include <fwData/Material.hpp>
+
+-
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiReconstructionQt/config.hpp"
+
++
+ class QRadioButton;
+ class QCheckBox;
+ class QButtonGroup;
+--- fw4spl.orig/Bundles/LeafUI/uiMeasurementQt/include/uiMeasurementQt/editor/Distance.hpp
++++ fw4spl/Bundles/LeafUI/uiMeasurementQt/include/uiMeasurementQt/editor/Distance.hpp
+@@ -10,10 +10,10 @@
+ #include <QObject>
+ #include <QPointer>
+ #include <QPushButton>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiMeasurementQt/config.hpp"
+
+ namespace uiMeasurement
+--- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/BasicFloatEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/BasicFloatEditor.hpp
+@@ -10,11 +10,11 @@
+ #include <QObject>
+ #include <QPointer>
+ #include <QLineEdit>
+-
++#ifndef Q_MOC_RUN
+ #include <fwTools/Failed.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiVisuQt/config.hpp"
+
+ namespace uiVisu
+--- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/PointEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/PointEditor.hpp
+@@ -13,11 +13,11 @@
+ #include <QPointer>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Point.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiVisuQt/config.hpp"
+
+ namespace uiVisu
+--- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/SnapshotEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/SnapshotEditor.hpp
+@@ -11,8 +11,9 @@
+ #include <QPointer>
+
+ #include <fwTools/Failed.hpp>
++#ifndef Q_MOC_RUN
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiVisuQt/config.hpp"
+
+ class QPushButton;
+--- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/TransformationMatrixEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/TransformationMatrixEditor.hpp
+@@ -12,9 +12,9 @@
+ #include <QSlider>
+
+ #include <fwTools/Failed.hpp>
+-
++#ifndef Q_MOC_RUN
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "uiVisuQt/config.hpp"
+
+ namespace uiVisu
+--- fw4spl.orig/Bundles/LeafVisu/scene2D/include/scene2D/Scene2DGraphicsView.hpp
++++ fw4spl/Bundles/LeafVisu/scene2D/include/scene2D/Scene2DGraphicsView.hpp
+@@ -11,10 +11,11 @@
+ #include <QResizeEvent>
+ #include <QGraphicsScene>
+ #include <QPaintEvent>
+-
++#ifndef Q_MOC_RUN
+ #include "scene2D/config.hpp"
+ #include "scene2D/data/Viewport.hpp"
+ #include "scene2D/data/Event.hpp"
++#endif
+
+ namespace scene2D
+ {
+--- fw4spl.orig/Bundles/LeafUI/uiTF/include/uiTF/TransferFunctionEditor.hpp
++++ fw4spl/Bundles/LeafUI/uiTF/include/uiTF/TransferFunctionEditor.hpp
+@@ -8,12 +8,12 @@
+ #define _UITF_TRANSFERFUNCTIONEDITOR_HPP_
+
+ #include <QObject>
+-
++#ifndef Q_MOC_RUN
+ #include <fwData/Composite.hpp>
+ #include <fwData/TransferFunction.hpp>
+
+ #include <gui/editor/IEditor.hpp>
+-
++#endif
+ #include "export.hpp"
+
+ class QComboBox;
+--- fw4spl.orig/SrcLib/io/fwAtomsBoostIO/src/fwAtomsBoostIO/Writer.cpp
++++ fw4spl/SrcLib/io/fwAtomsBoostIO/src/fwAtomsBoostIO/Writer.cpp
+@@ -304,7 +304,7 @@
+ break;
+ case XML:
+ {
+- ::boost::property_tree::xml_writer_settings<char> settings(' ', 4);
++ ::boost::property_tree::xml_writer_settings< std::string > settings('\t', 4);
+ ::boost::property_tree::xml_parser::write_xml(*os, root, settings);
+ break;
+ }
diff --git a/debian/patches/fix_missing_hdf5.patch b/debian/patches/fix_missing_hdf5.patch
index 326e552..bb9b973 100644
--- a/debian/patches/fix_missing_hdf5.patch
+++ b/debian/patches/fix_missing_hdf5.patch
@@ -1,3 +1,9 @@
+Description: Fix hdf5 with cmake
+Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
+Forwarded: no
+Last-Update: 2015-03-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- fw4spl.orig/CMake/Modules/FindHDF5.cmake
+++ fw4spl/CMake/Modules/FindHDF5.cmake
@@ -1,5 +1,3 @@
diff --git a/debian/patches/series b/debian/patches/series
index 394c0a5..9d596d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ set_media_as_bundle.patch
fix_unit_tests.patch
fix_cmakelists.patch
fix_missing_hdf5.patch
+fix_arm.patch
+fix_boost.patch
diff --git a/debian/rules b/debian/rules
index e20f693..8a7002f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
%:
- dh $@ --parallel
+ dh $@ --max-parallel=1
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DCMAKE_INSTALL_RPATH="/usr/lib/fw4spl" -Wno-dev
@@ -25,7 +25,7 @@ override_dh_auto_test:
echo "test disabled"
override_dh_shlibdeps:
- dh_shlibdeps -v -l/usr/lib:/usr/lib/fw4spl:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/gui_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/io_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/ctrlSelection_0-1/:/usr/lib/fw4spl/Bundles/ioITK_0-1/
+ dh_shlibdeps -v -l/usr/lib:/usr/lib/fw4spl:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/gui_0-1/:/usr/lib/fw4spllssss/Bundles:/usr/lib/fw4spl/Bundles/io_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/ctrlSelection_0-1/:/usr/lib/fw4spl/Bundles/ioITK_0-1/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git
More information about the debian-med-commit
mailing list