diff options
| author | Marius Bakke <[email protected]> | 2018-08-28 01:22:24 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2018-08-28 01:22:24 +0200 |
| commit | 61fca0fd22b81bcc0201a336a02cac74b42c6a44 (patch) | |
| tree | 67cca9c72282f24b9ceb0b1706c314537e8c37ea /gnu/packages/patches/avogadro-boost148.patch | |
| parent | 57dac1ee935edfab91e9b182c1f7c9ddae794656 (diff) | |
| parent | 526ce419303ac511be8d51b41471022bed472e6b (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/avogadro-boost148.patch')
| -rw-r--r-- | gnu/packages/patches/avogadro-boost148.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/patches/avogadro-boost148.patch new file mode 100644 index 0000000000..f244f14674 --- /dev/null +++ b/gnu/packages/patches/avogadro-boost148.patch @@ -0,0 +1,69 @@ +Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h +@@ -31,7 +31,9 @@ + + #include <avogadro/global.h> + #include <avogadro/engine.h> ++#ifndef Q_MOC_RUN + #include <boost/python.hpp> ++#endif + + namespace Avogadro { + +Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h +@@ -33,7 +33,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> +Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h ++++ avogadro-1.2.0/libavogadro/src/pythontool_p.h +@@ -31,7 +31,9 @@ + + #include <avogadro/global.h> + #include <avogadro/tool.h> ++#ifndef Q_MOC_RUN + #include <boost/python.hpp> ++#endif + + #include <QObject> + #include <QAction> +Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h ++++ avogadro-1.2.0/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> + +Index: avogadro-1.2.0/libavogadro/src/pythonscript.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h ++++ avogadro-1.2.0/libavogadro/src/pythonscript.h +@@ -27,6 +27,8 @@ + #define PYTHONSCRIPT_H + + #include <avogadro/global.h> ++#ifndef Q_MOC_RUN + #include <boost/python.hpp> ++#endif + + #include "pythonerror.h" |