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

2016-10-07 Thread Antonio Rojas
Date: Friday, October 7, 2016 @ 17:37:19
  Author: arojas
Revision: 277877

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

Added:
  avogadro/repos/staging-i686/
  avogadro/repos/staging-i686/PKGBUILD
(from rev 277876, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-i686/avogadro-fix-linking.patch
(from rev 277876, avogadro/trunk/avogadro-fix-linking.patch)
  avogadro/repos/staging-i686/avogadro-glibc2.23.patch
(from rev 277876, avogadro/trunk/avogadro-glibc2.23.patch)
  avogadro/repos/staging-i686/boost153.patch
(from rev 277876, avogadro/trunk/boost153.patch)
  avogadro/repos/staging-x86_64/
  avogadro/repos/staging-x86_64/PKGBUILD
(from rev 277876, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-x86_64/avogadro-fix-linking.patch
(from rev 277876, avogadro/trunk/avogadro-fix-linking.patch)
  avogadro/repos/staging-x86_64/avogadro-glibc2.23.patch
(from rev 277876, avogadro/trunk/avogadro-glibc2.23.patch)
  avogadro/repos/staging-x86_64/boost153.patch
(from rev 277876, avogadro/trunk/boost153.patch)

---+
 staging-i686/PKGBUILD |   47 +
 staging-i686/avogadro-fix-linking.patch   |   14 ++
 staging-i686/avogadro-glibc2.23.patch |   18 
 staging-i686/boost153.patch   |   60 
 staging-x86_64/PKGBUILD   |   47 +
 staging-x86_64/avogadro-fix-linking.patch |   14 ++
 staging-x86_64/avogadro-glibc2.23.patch   |   18 
 staging-x86_64/boost153.patch |   60 
 8 files changed, 278 insertions(+)

Copied: avogadro/repos/staging-i686/PKGBUILD (from rev 277876, 
avogadro/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-10-07 17:37:19 UTC (rev 277877)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino 
+# Contributor: Nick B 
+
+pkgname=avogadro
+pkgver=1.2.0
+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=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'boost153.patch' 'avogadro-glibc2.23.patch' 
'avogadro-fix-linking.patch')
+md5sums=('3206068fc27bd3b717c568ee72f1e5ec'
+ 'aa2573f78d5dbd85b3cb79e08acde8ab'
+ '83990ecbb4c076fddda3eaca2c2975ed'
+ 'e333f624d5649c6d3a7cfd14a778bc73')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/boost153.patch
+# Fix build with glibc 2.23
+  patch -p1 -i ../avogadro-glibc2.23.patch
+# Fix linking (Fedora)
+  patch -p1 -i ../avogadro-fix-linking.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/avogadro-fix-linking.patch (from rev 
277876, avogadro/trunk/avogadro-fix-linking.patch)
===
--- staging-i686/avogadro-fix-linking.patch (rev 0)
+++ staging-i686/avogadro-fix-linking.patch 2016-10-07 17:37:19 UTC (rev 
277877)
@@ -0,0 +1,14 @@
+diff -up avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 
avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt
+--- avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 
2013-12-06 09:50:04.0 -0600
 avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt   2016-01-25 
13:50:10.469758655 -0600
+@@ -20,8 +20,8 @@ if (WIN32)
+   set_target_properties(python-module PROPERTIES SUFFIX ".pyd")
+   target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
+ else()
+-  target_link_libraries(python-module stdc++ avogadro
+-${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
++  target_link_libraries(python-module stdc++ avogadro 
++${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENBABEL2_LIBRARIES} 
${Boost_LIBRARIES})
+ endif()
+ 
+ # Let's try to use this instead:

Copied: avogadro/repos/staging-i686/avogadro-glibc2.23.patch (from rev 277876, 
avogadro/trunk/avogadro-glibc2.23.patch)
===
--- staging-i686/avogadro-glibc2.23.patch   (rev 0)
+++ staging-i686/avogadro-glibc2.23.patch   2016-10-07 17:37:19 UTC (rev 
277877)
@@ -0,0 +1,18 @@
+--- 
avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig   
   2016-06-16 06:36:58.888214167 +
 av

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

2016-08-26 Thread Felix Yan
Date: Friday, August 26, 2016 @ 17:10:25
  Author: felixonmars
Revision: 274660

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

Added:
  avogadro/repos/staging-i686/
  avogadro/repos/staging-i686/PKGBUILD
(from rev 274659, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-i686/avogadro-fix-linking.patch
(from rev 274659, avogadro/trunk/avogadro-fix-linking.patch)
  avogadro/repos/staging-i686/avogadro-glibc2.23.patch
(from rev 274659, avogadro/trunk/avogadro-glibc2.23.patch)
  avogadro/repos/staging-i686/boost153.patch
(from rev 274659, avogadro/trunk/boost153.patch)
  avogadro/repos/staging-x86_64/
  avogadro/repos/staging-x86_64/PKGBUILD
(from rev 274659, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-x86_64/avogadro-fix-linking.patch
(from rev 274659, avogadro/trunk/avogadro-fix-linking.patch)
  avogadro/repos/staging-x86_64/avogadro-glibc2.23.patch
(from rev 274659, avogadro/trunk/avogadro-glibc2.23.patch)
  avogadro/repos/staging-x86_64/boost153.patch
(from rev 274659, avogadro/trunk/boost153.patch)

---+
 staging-i686/PKGBUILD |   47 +
 staging-i686/avogadro-fix-linking.patch   |   14 ++
 staging-i686/avogadro-glibc2.23.patch |   18 
 staging-i686/boost153.patch   |   60 
 staging-x86_64/PKGBUILD   |   47 +
 staging-x86_64/avogadro-fix-linking.patch |   14 ++
 staging-x86_64/avogadro-glibc2.23.patch   |   18 
 staging-x86_64/boost153.patch |   60 
 8 files changed, 278 insertions(+)

Copied: avogadro/repos/staging-i686/PKGBUILD (from rev 274659, 
avogadro/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-08-26 17:10:25 UTC (rev 274660)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino 
+# Contributor: Nick B 
+
+pkgname=avogadro
+pkgver=1.2.0
+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-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'boost153.patch' 'avogadro-glibc2.23.patch' 
'avogadro-fix-linking.patch')
+md5sums=('3206068fc27bd3b717c568ee72f1e5ec'
+ 'aa2573f78d5dbd85b3cb79e08acde8ab'
+ '83990ecbb4c076fddda3eaca2c2975ed'
+ 'e333f624d5649c6d3a7cfd14a778bc73')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/boost153.patch
+# Fix build with glibc 2.23
+  patch -p1 -i ../avogadro-glibc2.23.patch
+# Fix linking (Fedora)
+  patch -p1 -i ../avogadro-fix-linking.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/avogadro-fix-linking.patch (from rev 
274659, avogadro/trunk/avogadro-fix-linking.patch)
===
--- staging-i686/avogadro-fix-linking.patch (rev 0)
+++ staging-i686/avogadro-fix-linking.patch 2016-08-26 17:10:25 UTC (rev 
274660)
@@ -0,0 +1,14 @@
+diff -up avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 
avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt
+--- avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 
2013-12-06 09:50:04.0 -0600
 avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt   2016-01-25 
13:50:10.469758655 -0600
+@@ -20,8 +20,8 @@ if (WIN32)
+   set_target_properties(python-module PROPERTIES SUFFIX ".pyd")
+   target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
+ else()
+-  target_link_libraries(python-module stdc++ avogadro
+-${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
++  target_link_libraries(python-module stdc++ avogadro 
++${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENBABEL2_LIBRARIES} 
${Boost_LIBRARIES})
+ endif()
+ 
+ # Let's try to use this instead:

Copied: avogadro/repos/staging-i686/avogadro-glibc2.23.patch (from rev 274659, 
avogadro/trunk/avogadro-glibc2.23.patch)
===
--- staging-i686/avogadro-glibc2.23.patch   (rev 0)
+++ staging-i686/avogadro-glibc2.23.patch   2016-08-26 17:10:25 UTC (rev 
274660)
@@ -0,0 +1,18 @@
+--- 
avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig   
   2016-06-16 06:36:58.888214167 +
++

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

2016-04-27 Thread Felix Yan
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 
-# Contributor: Nick B 
-
-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 
+# Contributor: Nick B 
+
+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 +
-+++ avogadro-1.1.0/libavogadro/src/pythonengine_p.h2013-03-29 
12:45:43.123089622 +
-@@ -27,7 +27,9 @@
- 
- #include 
- #include 
-+#ifndef Q_MOC_RUN
- #include 
-+#endif
- 
- namespace Avogadro {
- 
 avogadro-1.1.0/libavogadro/src/pythonext

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

2013-03-29 Thread Stéphane Gaudreault
Date: Friday, March 29, 2013 @ 20:14:33
  Author: stephane
Revision: 181012

db-move: moved avogadro from [staging] to [testing] (i686, x86_64)

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

-+
 testing-i686/PKGBUILD   |   39 
 testing-i686/avogadro.install   |   11 ++
 testing-i686/boost153.patch |   60 ++
 testing-x86_64/PKGBUILD |   39 
 testing-x86_64/avogadro.install |   11 ++
 testing-x86_64/boost153.patch   |   60 ++
 6 files changed, 220 insertions(+)

Copied: avogadro/repos/testing-i686/PKGBUILD (from rev 181010, 
avogadro/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-03-29 19:14:33 UTC (rev 181012)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino 
+# Contributor: Nick B 
+
+pkgname=avogadro
+pkgver=1.1.0
+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-libgl')
+install=avogadro.install
+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/qt4/mkspecs
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: avogadro/repos/testing-i686/avogadro.install (from rev 181010, 
avogadro/repos/staging-i686/avogadro.install)
===
--- testing-i686/avogadro.install   (rev 0)
+++ testing-i686/avogadro.install   2013-03-29 19:14:33 UTC (rev 181012)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: avogadro/repos/testing-i686/boost153.patch (from rev 181010, 
avogadro/repos/staging-i686/boost153.patch)
===
--- testing-i686/boost153.patch (rev 0)
+++ testing-i686/boost153.patch 2013-03-29 19:14:33 UTC (rev 181012)
@@ -0,0 +1,60 @@
+--- avogadro-1.1.0/libavogadro/src/pythonengine_p.h~   2013-03-29 
12:46:16.306165881 +
 avogadro-1.1.0/libavogadro/src/pythonengine_p.h2013-03-29 
12:45:43.123089622 +
+@@ -27,7 +27,9 @@
+ 
+ #include 
+ #include 
++#ifndef Q_MOC_RUN
+ #include 
++#endif
+ 
+ namespace Avogadro {
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonextension_p.h~2013-03-29 
12:46:32.156043085 +
 avogadro-1.1.0/libavogadro/src/pythonextension_p.h 2013-03-29 
12:47:07.265771087 +
+@@ -29,7 +29,9 @@
+ #include 
+ #include 
+ #include 
++#ifndef Q_MOC_RUN
+ #include 
++#endif
+ 
+ #include 
+ #include 
+--- avogadro-1.1.0/libavogadro/src/pythontool_p.h~ 2013-03-29 
12:47:33.335569185 +
 avogadro-1.1.0/libavogadro/src/pythontool_p.h  2013-03-29 
12:47:50.732101147 +
+@@ -27,7 +27,9 @@
+ 
+ #include 
+ #include 
++#ifndef Q_MOC_RUN
+ #include 
++#endif
+ 
+ #include 
+ #include 
+--- avogadro-1.1.0/libavogadro/src/pythoninterpreter.h~2013-03-29 
12:50:46.550738652 +
 avogadro-1.1.0/libavogadro/src/pythoninterpreter.h 2013-03-29 
12:51:00.853961341 +
+@@ -26,7 +26,9 @@
+ #define PYTHONINTERPRETER_H
+ 
+ #include 
++#ifndef Q_MOC_RUN
+ #include 
++#endif
+ #include 
+ #include 
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonscript.h~ 2013-03-29 
12:52:00.723488935 +
 avogadro-1.1.0/libavogadro/src/pythonscript.h  2013-03-29 
12:52:11.

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

2013-01-28 Thread Stéphane Gaudreault
Date: Monday, January 28, 2013 @ 17:48:15
  Author: stephane
Revision: 176282

db-move: moved avogadro from [testing] to [extra] (i686, x86_64)

Added:
  avogadro/repos/extra-i686/PKGBUILD
(from rev 176280, avogadro/repos/testing-i686/PKGBUILD)
  avogadro/repos/extra-i686/avogadro.install
(from rev 176280, avogadro/repos/testing-i686/avogadro.install)
  avogadro/repos/extra-x86_64/PKGBUILD
(from rev 176280, avogadro/repos/testing-x86_64/PKGBUILD)
  avogadro/repos/extra-x86_64/avogadro.install
(from rev 176280, avogadro/repos/testing-x86_64/avogadro.install)
Deleted:
  avogadro/repos/extra-i686/PKGBUILD
  avogadro/repos/extra-i686/avogadro.install
  avogadro/repos/extra-x86_64/PKGBUILD
  avogadro/repos/extra-x86_64/avogadro.install
  avogadro/repos/testing-i686/
  avogadro/repos/testing-x86_64/

---+
 extra-i686/PKGBUILD   |   66 
 extra-i686/avogadro.install   |   22 ++---
 extra-x86_64/PKGBUILD |   66 
 extra-x86_64/avogadro.install |   22 ++---
 4 files changed, 88 insertions(+), 88 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-01-28 16:48:14 UTC (rev 176281)
+++ extra-i686/PKGBUILD 2013-01-28 16:48:15 UTC (rev 176282)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino 
-# Contributor: Nick B 
-
-pkgname=avogadro
-pkgver=1.1.0
-pkgrel=2
-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')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('f4fbef5ffc69cc312b2316426c36a78d')
-
-build() {
-  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
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: avogadro/repos/extra-i686/PKGBUILD (from rev 176280, 
avogadro/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-28 16:48:15 UTC (rev 176282)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino 
+# Contributor: Nick B 
+
+pkgname=avogadro
+pkgver=1.1.0
+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=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 
'python2-numpy')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa')
+install=avogadro.install
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('f4fbef5ffc69cc312b2316426c36a78d')
+
+build() {
+  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
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/avogadro.install
===
--- extra-i686/avogadro.install 2013-01-28 16:48:14 UTC (rev 176281)
+++ extra-i686/avogadro.install 2013-01-28 16:48:15 UTC (rev 176282)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: avogadro/repos/extra-i686/avogadro.install (from rev 176280, 
avogadro/repos/testing-i686/avogadro.install)
===
--- extra-i686/avogadro.install (rev 0)
+++ extra-i686/avogadro.install 2013-01-28 16:48:15 UTC (rev 176282)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2013-01-28 16:48:14 UTC (rev 176281)
+++ extra-x86_64/PKGBUILD   2013-01-28 16:48:15 UTC (rev 176282)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino 
-# Contributor: Nick B 
-
-pkgname=avogadro
-pkgver=1.1.0
-pkgrel=2
-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')
-install=avo

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

2012-03-05 Thread Ionut Biru
Date: Monday, March 5, 2012 @ 03:55:44
  Author: ibiru
Revision: 152200

db-move: moved avogadro from [testing] to [extra] (x86_64)

Added:
  avogadro/repos/extra-x86_64/PKGBUILD
(from rev 152196, avogadro/repos/testing-x86_64/PKGBUILD)
  avogadro/repos/extra-x86_64/avogadro.install
(from rev 152196, avogadro/repos/testing-x86_64/avogadro.install)
  avogadro/repos/extra-x86_64/fix-boost.patch
(from rev 152196, avogadro/repos/testing-x86_64/fix-boost.patch)
  avogadro/repos/extra-x86_64/fix-opengl-headers.patch
(from rev 152196, avogadro/repos/testing-x86_64/fix-opengl-headers.patch)
  avogadro/repos/extra-x86_64/replace-qt4_automoc-with-qt4_wrap_cpp.patch
(from rev 152196, 
avogadro/repos/testing-x86_64/replace-qt4_automoc-with-qt4_wrap_cpp.patch)
Deleted:
  avogadro/repos/extra-x86_64/PKGBUILD
  avogadro/repos/extra-x86_64/avogadro.install
  avogadro/repos/extra-x86_64/fix-boost.patch
  avogadro/repos/extra-x86_64/replace-qt4_automoc-with-qt4_wrap_cpp.patch
  avogadro/repos/testing-x86_64/

-+
 PKGBUILD|   87 -
 avogadro.install|   22 
 fix-boost.patch |   66 -
 fix-opengl-headers.patch|   53 
 replace-qt4_automoc-with-qt4_wrap_cpp.patch | 1556 +-
 5 files changed, 920 insertions(+), 864 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 152199:152200 to see the changes.


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

2012-03-05 Thread Ionut Biru
Date: Monday, March 5, 2012 @ 03:55:39
  Author: ibiru
Revision: 152199

db-move: moved avogadro from [testing] to [extra] (i686)

Added:
  avogadro/repos/extra-i686/PKGBUILD
(from rev 152196, avogadro/repos/testing-i686/PKGBUILD)
  avogadro/repos/extra-i686/avogadro.install
(from rev 152196, avogadro/repos/testing-i686/avogadro.install)
  avogadro/repos/extra-i686/fix-boost.patch
(from rev 152196, avogadro/repos/testing-i686/fix-boost.patch)
  avogadro/repos/extra-i686/fix-opengl-headers.patch
(from rev 152196, avogadro/repos/testing-i686/fix-opengl-headers.patch)
  avogadro/repos/extra-i686/replace-qt4_automoc-with-qt4_wrap_cpp.patch
(from rev 152196, 
avogadro/repos/testing-i686/replace-qt4_automoc-with-qt4_wrap_cpp.patch)
Deleted:
  avogadro/repos/extra-i686/PKGBUILD
  avogadro/repos/extra-i686/avogadro.install
  avogadro/repos/extra-i686/fix-boost.patch
  avogadro/repos/extra-i686/replace-qt4_automoc-with-qt4_wrap_cpp.patch
  avogadro/repos/testing-i686/

-+
 PKGBUILD|   87 -
 avogadro.install|   22 
 fix-boost.patch |   66 -
 fix-opengl-headers.patch|   53 
 replace-qt4_automoc-with-qt4_wrap_cpp.patch | 1556 +-
 5 files changed, 920 insertions(+), 864 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 152198:152199 to see the changes.


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

2011-11-29 Thread Andrea Scarpino
Date: Tuesday, November 29, 2011 @ 15:05:21
  Author: andrea
Revision: 143838

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

Added:
  avogadro/repos/staging-i686/
  avogadro/repos/staging-i686/PKGBUILD
(from rev 143837, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-i686/avogadro.install
(from rev 143837, avogadro/trunk/avogadro.install)
  avogadro/repos/staging-i686/fix-boost.patch
(from rev 143837, avogadro/trunk/fix-boost.patch)
  avogadro/repos/staging-i686/replace-qt4_automoc-with-qt4_wrap_cpp.patch
(from rev 143837, 
avogadro/trunk/replace-qt4_automoc-with-qt4_wrap_cpp.patch)
  avogadro/repos/staging-x86_64/
  avogadro/repos/staging-x86_64/PKGBUILD
(from rev 143837, avogadro/trunk/PKGBUILD)
  avogadro/repos/staging-x86_64/avogadro.install
(from rev 143837, avogadro/trunk/avogadro.install)
  avogadro/repos/staging-x86_64/fix-boost.patch
(from rev 143837, avogadro/trunk/fix-boost.patch)
  avogadro/repos/staging-x86_64/replace-qt4_automoc-with-qt4_wrap_cpp.patch
(from rev 143837, 
avogadro/trunk/replace-qt4_automoc-with-qt4_wrap_cpp.patch)

+
 staging-i686/PKGBUILD  |   42 
 staging-i686/avogadro.install  |   11 
 staging-i686/fix-boost.patch   |   33 
 staging-i686/replace-qt4_automoc-with-qt4_wrap_cpp.patch   |  778 +++
 staging-x86_64/PKGBUILD|   42 
 staging-x86_64/avogadro.install|   11 
 staging-x86_64/fix-boost.patch |   33 
 staging-x86_64/replace-qt4_automoc-with-qt4_wrap_cpp.patch |  778 +++
 8 files changed, 1728 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 143837:143838 to see the changes.