diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-01 00:05:25 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-01 00:05:25 -0700 |
| commit | c623429f33c434cb1cb11974d9e71f48dd5a881f (patch) | |
| tree | a5ef4b20d134eb0384a567b98ea41733f2db73c7 /extra/avogadro | |
| parent | bccd6b361bd252b2d32bc9a793c9e1b8448bfcd9 (diff) | |
Mon Apr 1 00:05:25 PDT 2013
Diffstat (limited to 'extra/avogadro')
| -rw-r--r-- | extra/avogadro/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/avogadro/boost153.patch | 60 |
2 files changed, 72 insertions, 6 deletions
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 9a0b47174..a043648bb 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,29 +1,35 @@ -# $Id: PKGBUILD 176282 2013-01-28 16:48:15Z stephane $ +# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> 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" license=('GPL2') depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost' 'doxygen' 'mesa') +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} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt/mkspecs + -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs make } diff --git a/extra/avogadro/boost153.patch b/extra/avogadro/boost153.patch new file mode 100644 index 000000000..fd8685974 --- /dev/null +++ b/extra/avogadro/boost153.patch @@ -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" + |