Date: Wednesday, April 27, 2016 @ 16:42:28 Author: fyan Revision: 266223
archrelease: copy trunk to extra-i686, extra-x86_64 Added: avogadro/repos/extra-i686/PKGBUILD (from rev 266221, avogadro/trunk/PKGBUILD) avogadro/repos/extra-i686/boost153.patch (from rev 266221, avogadro/trunk/boost153.patch) avogadro/repos/extra-x86_64/PKGBUILD (from rev 266222, avogadro/trunk/PKGBUILD) avogadro/repos/extra-x86_64/boost153.patch (from rev 266222, avogadro/trunk/boost153.patch) Deleted: avogadro/repos/extra-i686/PKGBUILD avogadro/repos/extra-i686/avogadro.install avogadro/repos/extra-i686/boost153.patch avogadro/repos/extra-x86_64/PKGBUILD avogadro/repos/extra-x86_64/avogadro.install avogadro/repos/extra-x86_64/boost153.patch -------------------------------+ /PKGBUILD | 84 ++++++++++++++++++++++++++++ /boost153.patch | 120 ++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 43 -------------- extra-i686/avogadro.install | 11 --- extra-i686/boost153.patch | 60 -------------------- extra-x86_64/PKGBUILD | 43 -------------- extra-x86_64/avogadro.install | 11 --- extra-x86_64/boost153.patch | 60 -------------------- 8 files changed, 204 insertions(+), 228 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-i686/PKGBUILD 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.1.1 -pkgrel=8 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'boost153.patch') -md5sums=('1223bb18f50dccd2c60538aa90d58c7a' - 'aa2573f78d5dbd85b3cb79e08acde8ab') - -prepare() { - mkdir build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/boost153.patch -} - -build() { - cd build - - export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel" - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: avogadro/repos/extra-i686/PKGBUILD (from rev 266221, avogadro/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-04-27 14:42:28 UTC (rev 266223) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.1.1 +pkgrel=9 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'boost153.patch') +md5sums=('1223bb18f50dccd2c60538aa90d58c7a' + 'aa2573f78d5dbd85b3cb79e08acde8ab') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/boost153.patch +} + +build() { + cd build + + export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel" + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/avogadro.install =================================================================== --- extra-i686/avogadro.install 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-i686/avogadro.install 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Deleted: extra-i686/boost153.patch =================================================================== --- extra-i686/boost153.patch 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-i686/boost153.patch 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,60 +0,0 @@ ---- 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" - Copied: avogadro/repos/extra-i686/boost153.patch (from rev 266221, avogadro/trunk/boost153.patch) =================================================================== --- extra-i686/boost153.patch (rev 0) +++ extra-i686/boost153.patch 2016-04-27 14:42:28 UTC (rev 266223) @@ -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" + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-x86_64/PKGBUILD 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.1.1 -pkgrel=8 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'boost153.patch') -md5sums=('1223bb18f50dccd2c60538aa90d58c7a' - 'aa2573f78d5dbd85b3cb79e08acde8ab') - -prepare() { - mkdir build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/boost153.patch -} - -build() { - cd build - - export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel" - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: avogadro/repos/extra-x86_64/PKGBUILD (from rev 266222, avogadro/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-04-27 14:42:28 UTC (rev 266223) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.1.1 +pkgrel=9 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'boost153.patch') +md5sums=('1223bb18f50dccd2c60538aa90d58c7a' + 'aa2573f78d5dbd85b3cb79e08acde8ab') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/boost153.patch +} + +build() { + cd build + + export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel" + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/avogadro.install =================================================================== --- extra-x86_64/avogadro.install 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-x86_64/avogadro.install 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Deleted: extra-x86_64/boost153.patch =================================================================== --- extra-x86_64/boost153.patch 2016-04-27 14:42:11 UTC (rev 266222) +++ extra-x86_64/boost153.patch 2016-04-27 14:42:28 UTC (rev 266223) @@ -1,60 +0,0 @@ ---- 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" - Copied: avogadro/repos/extra-x86_64/boost153.patch (from rev 266222, avogadro/trunk/boost153.patch) =================================================================== --- extra-x86_64/boost153.patch (rev 0) +++ extra-x86_64/boost153.patch 2016-04-27 14:42:28 UTC (rev 266223) @@ -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" +