tags 652795 + patch tags 652795 + pending thanks Dear maintainer,
I've prepared an NMU for ovito (versioned as 0.9.2-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -Steve
diff -Nru ovito-0.9.2/debian/changelog ovito-0.9.2/debian/changelog
--- ovito-0.9.2/debian/changelog 2010-10-30 16:46:45.000000000 -0500
+++ ovito-0.9.2/debian/changelog 2012-01-22 20:11:46.000000000 -0600
@@ -1,3 +1,11 @@
+ovito (0.9.2-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+
+ * patches/boost1.48: New. Work around moc limitation. Closes: #652795.
+
+ -- Steve M. Robbins <s...@debian.org> Sun, 22 Jan 2012 20:11:46 -0600
+
ovito (0.9.2-1) unstable; urgency=low
* Initial release (Closes: #600812)
diff -Nru ovito-0.9.2/debian/patches/boost1.48 ovito-0.9.2/debian/patches/boost1.48
--- ovito-0.9.2/debian/patches/boost1.48 1969-12-31 18:00:00.000000000 -0600
+++ ovito-0.9.2/debian/patches/boost1.48 2012-01-22 15:37:34.000000000 -0600
@@ -0,0 +1,98 @@
+Description: Work around moc limitations
+ Some parts of Boost, introduced in Boost 1.48 are not
+ understood by the limited C++ parser of moc. This
+ patch defines header guards that prevent the troublesome boost
+ headers from being processed.
+Bug-Debian: #652795
+Author: Tobias Frost <t...@coldtobi.de>
+Reviewed-By: Steve Robbins <s...@debian.org>
+
+
+--- 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
diff -Nru ovito-0.9.2/debian/patches/series ovito-0.9.2/debian/patches/series
--- ovito-0.9.2/debian/patches/series 2010-10-29 08:58:04.000000000 -0500
+++ ovito-0.9.2/debian/patches/series 2012-01-22 15:05:23.000000000 -0600
@@ -1 +1,2 @@
debian-changes-0.9.2-1~2
+boost1.48
signature.asc
Description: Digital signature
