7d01ee66d4
* gnu/packages/chemistry.scm (avogadro): New variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them.
69 lines
2 KiB
Diff
69 lines
2 KiB
Diff
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"
|