Date: Friday, March 29, 2013 @ 13:57:15 Author: andrea Revision: 180988
boost rebuild Added: avogadro/trunk/boost153.patch Modified: avogadro/trunk/PKGBUILD ----------------+ PKGBUILD | 12 ++++++++--- boost153.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-29 12:51:19 UTC (rev 180987) +++ PKGBUILD 2013-03-29 12:57:15 UTC (rev 180988) @@ -5,7 +5,7 @@ pkgname=avogadro pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64') url="http://avogadro.openmolecules.net/wiki/Main_Page" @@ -13,10 +13,16 @@ depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl') install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f4fbef5ffc69cc312b2316426c36a78d') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'boost153.patch') +md5sums=('f4fbef5ffc69cc312b2316426c36a78d' + 'aa2573f78d5dbd85b3cb79e08acde8ab') build() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/boost153.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ Added: boost153.patch =================================================================== --- boost153.patch (rev 0) +++ boost153.patch 2013-03-29 12:57:15 UTC (rev 180988) @@ -0,0 +1,60 @@ +--- avogadro-1.1.0/libavogadro/src/pythonengine_p.h~ 2013-03-29 12:46:16.306165881 +0000 ++++ avogadro-1.1.0/libavogadro/src/pythonengine_p.h 2013-03-29 12:45:43.123089622 +0000 +@@ -27,7 +27,9 @@ + + #include <avogadro/global.h> + #include <avogadro/engine.h> ++#ifndef Q_MOC_RUN + #include <boost/python.hpp> ++#endif + + namespace Avogadro { + +--- avogadro-1.1.0/libavogadro/src/pythonextension_p.h~ 2013-03-29 12:46:32.156043085 +0000 ++++ avogadro-1.1.0/libavogadro/src/pythonextension_p.h 2013-03-29 12:47:07.265771087 +0000 +@@ -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> +--- avogadro-1.1.0/libavogadro/src/pythontool_p.h~ 2013-03-29 12:47:33.335569185 +0000 ++++ avogadro-1.1.0/libavogadro/src/pythontool_p.h 2013-03-29 12:47:50.732101147 +0000 +@@ -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> +--- avogadro-1.1.0/libavogadro/src/pythoninterpreter.h~ 2013-03-29 12:50:46.550738652 +0000 ++++ avogadro-1.1.0/libavogadro/src/pythoninterpreter.h 2013-03-29 12:51:00.853961341 +0000 +@@ -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> + +--- avogadro-1.1.0/libavogadro/src/pythonscript.h~ 2013-03-29 12:52:00.723488935 +0000 ++++ avogadro-1.1.0/libavogadro/src/pythonscript.h 2013-03-29 12:52:11.676745364 +0000 +@@ -27,7 +27,9 @@ + #define PYTHONSCRIPT_H + + #include <avogadro/global.h> ++#ifndef Q_MOC_RUN + #include <boost/python.hpp> ++#endif + + #include "pythonerror.h" +