Subject: src:ovito: Adding patch Followup-For: Bug #652795 Package: src:ovito
The attached patch fixes the FTBFS. coldtobi -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 3.1.0-1-686-pae (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
--- a/src/atomviz/CMakeLists.txt +++ b/src/atomviz/CMakeLists.txt @@ -199,7 +199,7 @@ ENDIF(OVITO_BUILD_PLUGIN_SCRIPTING) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(AtomViz_MOC_SRCS ${AtomViz_MOC_HDRS}) +QT4_WRAP_CPP(AtomViz_MOC_SRCS ${AtomViz_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Generate plugin module. ADD_LIBRARY(AtomViz --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -58,7 +58,7 @@ ) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(Base_MOC_SRCS ${Base_MOC_HDRS}) +QT4_WRAP_CPP(Base_MOC_SRCS ${Base_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Create shared library. ADD_LIBRARY(Base --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -354,7 +354,7 @@ ) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(Core_MOC_SRCS ${Core_MOC_HDRS}) +QT4_WRAP_CPP(Core_MOC_SRCS ${Core_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Include a resource file in the library. QT4_ADD_RESOURCES(Core_RC_SRCS resources/core.qrc) --- a/src/crystalanalysis/CMakeLists.txt +++ b/src/crystalanalysis/CMakeLists.txt @@ -79,7 +79,7 @@ ENDIF(OVITO_BUILD_PLUGIN_SCRIPTING) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(CrystalAnalysis_MOC_SRCS ${CrystalAnalysis_MOC_HDRS}) +QT4_WRAP_CPP(CrystalAnalysis_MOC_SRCS ${CrystalAnalysis_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Generate plugin module. ADD_LIBRARY(CrystalAnalysis --- a/src/povray/CMakeLists.txt +++ b/src/povray/CMakeLists.txt @@ -60,7 +60,7 @@ ENDIF(OVITO_BUILD_PLUGIN_SCRIPTING) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(POVRay_MOC_SRCS ${POVRay_MOC_HDRS}) +QT4_WRAP_CPP(POVRay_MOC_SRCS ${POVRay_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Create plugin library. ADD_LIBRARY(POVRay --- a/src/scripting/CMakeLists.txt +++ b/src/scripting/CMakeLists.txt @@ -54,7 +54,7 @@ ) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(Scripting_MOC_SRCS ${Scripting_MOC_HDRS}) +QT4_WRAP_CPP(Scripting_MOC_SRCS ${Scripting_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED ) # Create plugin library. ADD_LIBRARY(Scripting --- a/src/scripting_gui/CMakeLists.txt +++ b/src/scripting_gui/CMakeLists.txt @@ -53,7 +53,7 @@ ) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(Scripting_gui_MOC_SRCS ${Scripting_gui_MOC_HDRS}) +QT4_WRAP_CPP(Scripting_gui_MOC_SRCS ${Scripting_gui_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) # Create plugin library. ADD_LIBRARY(ScriptingGUI --- a/src/stdobjects/CMakeLists.txt +++ b/src/stdobjects/CMakeLists.txt @@ -54,7 +54,7 @@ ) # Use the QT meta-object compiler to generate additional code. -QT4_WRAP_CPP(StdObjects_MOC_SRCS ${StdObjects_MOC_HDRS}) +QT4_WRAP_CPP(StdObjects_MOC_SRCS ${StdObjects_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED ) # Create plugin library. ADD_LIBRARY(StdObjects