diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-03-24 10:31:07 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-03-24 10:31:07 +0000 |
| commit | 47bf22448441db07edd04007e844e251acf06dfc (patch) | |
| tree | 87b699fa6423b6c968f546361d0d46f42e85a4cc /science | |
| parent | Add net/corosync. (diff) | |
qt4-moc: Add more Boost include guards to moc's definition list.
In preparation for updating Boost to 1.60, add include guards from more Boost
headers to the list of macros that moc automatically defines when processing
files. As explained in r408911, Qt4's moc cannot parse some constructs used by
a few Boost headers, so we define their include guards to make moc skip them.
This is a cleaner approach that allows us to largely revert r408472, r408473,
r408474, r408475, r408502, r408773 and r408419, which added several patches to
many ports to work around this moc bug.
PR: 199601
PR: 208322
Notes
Notes:
svn path=/head/; revision=411765
Diffstat (limited to 'science')
5 files changed, 0 insertions, 60 deletions
diff --git a/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h b/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h deleted file mode 100644 index 826466410c34..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libavogadro/src/pythonengine_p.h.orig 2013-12-06 15:50:04 UTC -+++ libavogadro/src/pythonengine_p.h -@@ -27,7 +27,9 @@ - - #include <avogadro/global.h> - #include <avogadro/engine.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - - namespace Avogadro { - diff --git a/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h b/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h deleted file mode 100644 index df7a1031492c..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libavogadro/src/pythonextension_p.h.orig 2013-12-06 15:50:04 UTC -+++ libavogadro/src/pythonextension_p.h -@@ -29,7 +29,9 @@ - #include <avogadro/extension.h> - #include <avogadro/primitive.h> - #include <avogadro/glwidget.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - - #include <QWidget> - #include <QList> diff --git a/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h b/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h deleted file mode 100644 index 203d31cd7914..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libavogadro/src/pythoninterpreter.h.orig 2013-12-06 15:50:04 UTC -+++ libavogadro/src/pythoninterpreter.h -@@ -26,7 +26,9 @@ - #define PYTHONINTERPRETER_H - - #include <avogadro/global.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - #include <avogadro/primitive.h> - #include <QString> - diff --git a/science/avogadro/files/patch-libavogadro_src_pythonscript.h b/science/avogadro/files/patch-libavogadro_src_pythonscript.h deleted file mode 100644 index 6d4424612d35..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_pythonscript.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libavogadro/src/pythonscript.h.orig 2013-12-06 15:50:04 UTC -+++ libavogadro/src/pythonscript.h -@@ -27,7 +27,9 @@ - #define PYTHONSCRIPT_H - - #include <avogadro/global.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - - #include "pythonerror.h" - diff --git a/science/avogadro/files/patch-libavogadro_src_pythontool__p.h b/science/avogadro/files/patch-libavogadro_src_pythontool__p.h deleted file mode 100644 index 88b3fb30e0f6..000000000000 --- a/science/avogadro/files/patch-libavogadro_src_pythontool__p.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libavogadro/src/pythontool_p.h.orig 2013-12-06 15:50:04 UTC -+++ libavogadro/src/pythontool_p.h -@@ -27,7 +27,9 @@ - - #include <avogadro/global.h> - #include <avogadro/tool.h> -+#ifndef Q_MOC_RUN - #include <boost/python.hpp> -+#endif - - #include <QObject> - #include <QAction> |