[arch-commits] Commit in avogadro/repos (11 files)

Felix Yan fyan at archlinux.org
Wed Aug 13 00:34:36 UTC 2014


    Date: Wednesday, August 13, 2014 @ 02:34:36
  Author: fyan
Revision: 219642

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  avogadro/repos/staging-i686/PKGBUILD
    (from rev 219641, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-i686/avogadro.install
    (from rev 219641, avogadro/trunk/avogadro.install)
  avogadro/repos/staging-i686/boost153.patch
    (from rev 219641, avogadro/trunk/boost153.patch)
  avogadro/repos/staging-x86_64/PKGBUILD
    (from rev 219641, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-x86_64/avogadro.install
    (from rev 219641, avogadro/trunk/avogadro.install)
  avogadro/repos/staging-x86_64/boost153.patch
    (from rev 219641, avogadro/trunk/boost153.patch)
Deleted:
  avogadro/repos/staging-i686/PKGBUILD
  avogadro/repos/staging-i686/avogadro.install
  avogadro/repos/staging-x86_64/PKGBUILD
  avogadro/repos/staging-x86_64/avogadro.install
  avogadro/repos/staging-x86_64/boost153.patch

---------------------------------+
 /PKGBUILD                       |   82 ++++++++++++++++++++++++++++++++++++++
 /avogadro.install               |   22 ++++++++++
 /boost153.patch                 |   60 +++++++++++++++++++++++++++
 staging-i686/PKGBUILD           |   41 -------------------
 staging-i686/avogadro.install   |   11 -----
 staging-i686/boost153.patch     |   60 +++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD         |   41 -------------------
 staging-x86_64/avogadro.install |   11 -----
 staging-x86_64/boost153.patch   |   60 ---------------------------
 9 files changed, 224 insertions(+), 164 deletions(-)

Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD	2014-08-13 00:32:38 UTC (rev 219641)
+++ staging-i686/PKGBUILD	2014-08-13 00:34:36 UTC (rev 219642)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.1.1
-pkgrel=3
-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-pyqt' '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
-  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/staging-i686/PKGBUILD (from rev 219641, avogadro/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-08-13 00:34:36 UTC (rev 219642)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
+
+pkgname=avogadro
+pkgver=1.1.1
+pkgrel=3
+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-pyqt' '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
+  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: staging-i686/avogadro.install
===================================================================
--- staging-i686/avogadro.install	2014-08-13 00:32:38 UTC (rev 219641)
+++ staging-i686/avogadro.install	2014-08-13 00:34:36 UTC (rev 219642)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: avogadro/repos/staging-i686/avogadro.install (from rev 219641, avogadro/trunk/avogadro.install)
===================================================================
--- staging-i686/avogadro.install	                        (rev 0)
+++ staging-i686/avogadro.install	2014-08-13 00:34:36 UTC (rev 219642)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: avogadro/repos/staging-i686/boost153.patch (from rev 219641, avogadro/trunk/boost153.patch)
===================================================================
--- staging-i686/boost153.patch	                        (rev 0)
+++ staging-i686/boost153.patch	2014-08-13 00:34:36 UTC (rev 219642)
@@ -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: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD	2014-08-13 00:32:38 UTC (rev 219641)
+++ staging-x86_64/PKGBUILD	2014-08-13 00:34:36 UTC (rev 219642)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.1.1
-pkgrel=3
-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-pyqt' '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
-  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/staging-x86_64/PKGBUILD (from rev 219641, avogadro/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-08-13 00:34:36 UTC (rev 219642)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
+
+pkgname=avogadro
+pkgver=1.1.1
+pkgrel=3
+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-pyqt' '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
+  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: staging-x86_64/avogadro.install
===================================================================
--- staging-x86_64/avogadro.install	2014-08-13 00:32:38 UTC (rev 219641)
+++ staging-x86_64/avogadro.install	2014-08-13 00:34:36 UTC (rev 219642)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: avogadro/repos/staging-x86_64/avogadro.install (from rev 219641, avogadro/trunk/avogadro.install)
===================================================================
--- staging-x86_64/avogadro.install	                        (rev 0)
+++ staging-x86_64/avogadro.install	2014-08-13 00:34:36 UTC (rev 219642)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: staging-x86_64/boost153.patch
===================================================================
--- staging-x86_64/boost153.patch	2014-08-13 00:32:38 UTC (rev 219641)
+++ staging-x86_64/boost153.patch	2014-08-13 00:34:36 UTC (rev 219642)
@@ -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/staging-x86_64/boost153.patch (from rev 219641, avogadro/trunk/boost153.patch)
===================================================================
--- staging-x86_64/boost153.patch	                        (rev 0)
+++ staging-x86_64/boost153.patch	2014-08-13 00:34:36 UTC (rev 219642)
@@ -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"
+ 




More information about the arch-commits mailing list