[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2016-10-07 Thread Antonio Rojas 
Date: Friday, October 7, 2016 @ 17:36:47
  Author: arojas
Revision: 277876

Boost 1.62 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-07 17:25:07 UTC (rev 277875)
+++ PKGBUILD2016-10-07 17:36:47 UTC (rev 277876)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.2.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;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2016-08-26 Thread Felix Yan 
Date: Friday, August 26, 2016 @ 17:09:32
  Author: felixonmars
Revision: 274659

upgpkg: avogadro 1.2.0-3

boost 1.61 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-26 16:50:40 UTC (rev 274658)
+++ PKGBUILD2016-08-26 17:09:32 UTC (rev 274659)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2016-07-07 Thread Antonio Rojas 
Date: Thursday, July 7, 2016 @ 22:38:53
  Author: arojas
Revision: 271151

Use eigen3

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-07 20:27:43 UTC (rev 271150)
+++ PKGBUILD2016-07-07 22:38:53 UTC (rev 271151)
@@ -5,13 +5,13 @@
 
 pkgname=avogadro
 pkgver=1.2.0
-pkgrel=1
+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=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2')
+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'

[arch-commits] Commit in avogadro/trunk (PKGBUILD avogadro.install)

2016-04-27 Thread Felix Yan 
Date: Wednesday, April 27, 2016 @ 16:41:49
  Author: fyan
Revision: 266220

upgpkg: avogadro 1.1.1-9

Hooks rebuild (part 1)

Modified:
  avogadro/trunk/PKGBUILD
Deleted:
  avogadro/trunk/avogadro.install

--+
 PKGBUILD |3 +--
 avogadro.install |   11 ---
 2 files changed, 1 insertion(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 14:41:24 UTC (rev 266219)
+++ PKGBUILD2016-04-27 14:41:49 UTC (rev 266220)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=8
+pkgrel=9
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -12,7 +12,6 @@
 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'

Deleted: avogadro.install
===
--- avogadro.install2016-04-27 14:41:24 UTC (rev 266219)
+++ avogadro.install2016-04-27 14:41:49 UTC (rev 266220)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2015-12-21 Thread Felix Yan 
Date: Monday, December 21, 2015 @ 18:35:15
  Author: fyan
Revision: 257073

boost 1.60.0 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-21 17:29:35 UTC (rev 257072)
+++ PKGBUILD2015-12-21 17:35:15 UTC (rev 257073)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=7
+pkgrel=8
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2015-12-07 Thread Evangelos Foutras 
Date: Monday, December 7, 2015 @ 15:26:09
  Author: foutrelis
Revision: 253378

C++11 ABI rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 14:20:38 UTC (rev 253377)
+++ PKGBUILD2015-12-07 14:26:09 UTC (rev 253378)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=6
+pkgrel=7
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2015-12-07 Thread Felix Yan 
Date: Monday, December 7, 2015 @ 15:20:38
  Author: fyan
Revision: 253377

workaround openbabel issue

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 14:08:34 UTC (rev 253376)
+++ PKGBUILD2015-12-07 14:20:38 UTC (rev 253377)
@@ -28,7 +28,7 @@
 build() {
   cd build
 
-  export CXXFLAGS="$CXXFLAGS -lX11"
+  export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel"
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2015-10-15 Thread Evangelos Foutras 
Date: Thursday, October 15, 2015 @ 14:57:25
  Author: foutrelis
Revision: 249380

boost 1.59.0 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 12:55:10 UTC (rev 249379)
+++ PKGBUILD2015-10-15 12:57:25 UTC (rev 249380)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=5
+pkgrel=6
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2015-04-21 Thread Antonio Rojas 
Date: Tuesday, April 21, 2015 @ 09:09:38
  Author: arojas
Revision: 237852

Boost 1.58 rebuild, fix linking

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-21 06:55:59 UTC (rev 237851)
+++ PKGBUILD2015-04-21 07:09:38 UTC (rev 237852)
@@ -5,12 +5,12 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=4
+pkgrel=5
 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')
+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;
@@ -27,6 +27,8 @@
 
 build() {
   cd build
+
+  export CXXFLAGS=$CXXFLAGS -lX11
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2014-11-04 Thread Felix Yan 
Date: Wednesday, November 5, 2014 @ 04:44:32
  Author: fyan
Revision: 225635

upgpkg: avogadro 1.1.1-4

boost 1.57.0 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-05 03:27:16 UTC (rev 225634)
+++ PKGBUILD2014-11-05 03:44:32 UTC (rev 225635)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2014-08-12 Thread Felix Yan 
Date: Wednesday, August 13, 2014 @ 02:14:34
  Author: fyan
Revision: 219638

upgpkg: avogadro 1.1.1-3

boost 1.56.0 rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-13 00:14:25 UTC (rev 219637)
+++ PKGBUILD2014-08-13 00:14:34 UTC (rev 219638)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2014-02-08 Thread Andrea Scarpino 
Date: Saturday, February 8, 2014 @ 16:48:07
  Author: andrea
Revision: 205594

upgpkg: avogadro 1.1.1-2

Bump pkgrel due to previous change in depends array

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-08 12:33:16 UTC (rev 205593)
+++ PKGBUILD2014-02-08 15:48:07 UTC (rev 205594)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2014-01-26 Thread Andrea Scarpino 
Date: Sunday, January 26, 2014 @ 13:10:20
  Author: andrea
Revision: 204746

Not needed at runtime

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-26 11:42:59 UTC (rev 204745)
+++ PKGBUILD2014-01-26 12:10:20 UTC (rev 204746)
@@ -10,8 +10,8 @@
 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')
+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')

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-12-31 Thread Andrea Scarpino 
Date: Tuesday, December 31, 2013 @ 15:59:22
  Author: andrea
Revision: 203002

upgpkg: avogadro 1.1.1-1

Upstream release

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-31 11:59:50 UTC (rev 203001)
+++ PKGBUILD2013-12-31 14:59:22 UTC (rev 203002)
@@ -4,8 +4,8 @@
 # Contributor: Nick B Shirakawasuna at gmail _dot_com
 
 pkgname=avogadro
-pkgver=1.1.0
-pkgrel=6
+pkgver=1.1.1
+pkgrel=1
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -15,15 +15,17 @@
 install=avogadro.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
 'boost153.patch')
-md5sums=('f4fbef5ffc69cc312b2316426c36a78d'
+md5sums=('1223bb18f50dccd2c60538aa90d58c7a'
  'aa2573f78d5dbd85b3cb79e08acde8ab')
 
-build() {
+prepare() {
+  mkdir build
+
   cd ${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/boost153.patch
-  cd ../
+}
 
-  mkdir build
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-11-24 Thread Bartłomiej Piotrowski 
Date: Sunday, November 24, 2013 @ 14:01:44
  Author: bpiotrowski
Revision: 200274

upgpkg: avogadro 1.1.0-6

rebuild against boost 1.55.0

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-24 11:02:13 UTC (rev 200273)
+++ PKGBUILD2013-11-24 13:01:44 UTC (rev 200274)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-07-06 Thread Bartłomiej Piotrowski 
Date: Saturday, July 6, 2013 @ 22:20:11
  Author: bpiotrowski
Revision: 189745

upgpkg: avogadro 1.1.0-5

- rebuild against boost 1.54.0

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-06 19:03:10 UTC (rev 189744)
+++ PKGBUILD2013-07-06 20:20:11 UTC (rev 189745)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD boost153.patch)

2013-03-29 Thread Andrea Scarpino 
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
===
--- PKGBUILD2013-03-29 12:51:19 UTC (rev 180987)
+++ PKGBUILD2013-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 +
 avogadro-1.1.0/libavogadro/src/pythonengine_p.h2013-03-29 
12:45:43.123089622 +
+@@ -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 +
 avogadro-1.1.0/libavogadro/src/pythonextension_p.h 2013-03-29 
12:47:07.265771087 +
+@@ -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 +
 avogadro-1.1.0/libavogadro/src/pythontool_p.h  2013-03-29 
12:47:50.732101147 +
+@@ -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 +
 avogadro-1.1.0/libavogadro/src/pythoninterpreter.h 2013-03-29 
12:51:00.853961341 +
+@@ -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 +
 avogadro-1.1.0/libavogadro/src/pythonscript.h  2013-03-29 
12:52:11.676745364 +
+@@ -27,7 +27,9 @@
+ #define PYTHONSCRIPT_H
+ 
+ #include avogadro/global.h
++#ifndef Q_MOC_RUN
+ #include boost/python.hpp
++#endif
+ 
+ #include pythonerror.h
+

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-03-02 Thread Andrea Scarpino 
Date: Saturday, March 2, 2013 @ 23:52:16
  Author: andrea
Revision: 179070

usr/share/qt/mkspecs/ - usr/share/qt4/mkspecs/; mesa

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-02 22:41:59 UTC (rev 179069)
+++ PKGBUILD2013-03-02 22:52:16 UTC (rev 179070)
@@ -11,7 +11,7 @@
 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')
@@ -23,7 +23,7 @@
 -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
 }

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-01-21 Thread eric 
Date: Tuesday, January 22, 2013 @ 05:04:07
  Author: eric
Revision: 175817

upgpkg: avogadro 1.1.0-3

Rebuild against boost 1.52.0

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-22 04:01:47 UTC (rev 175816)
+++ PKGBUILD2013-01-22 04:04:07 UTC (rev 175817)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2013-01-02 Thread Andrea Scarpino 
Date: Thursday, January 3, 2013 @ 02:01:39
  Author: andrea
Revision: 174168

upgpkg: avogadro 1.1.0-2

A rebuild seems to fix a segfault (FS#33276)

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-03 06:57:29 UTC (rev 174167)
+++ PKGBUILD2013-01-03 07:01:39 UTC (rev 174168)
@@ -5,13 +5,13 @@
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=1
+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')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa')
 install=avogadro.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('f4fbef5ffc69cc312b2316426c36a78d')

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2012-07-07 Thread Andrea Scarpino 
Date: Saturday, July 7, 2012 @ 12:06:53
  Author: andrea
Revision: 163124

upgpkg: avogadro 1.0.3-6

boost rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-07 16:03:55 UTC (rev 163123)
+++ PKGBUILD2012-07-07 16:06:53 UTC (rev 163124)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD fix-opengl-headers.patch)

2012-02-27 Thread Andrea Scarpino 
Date: Monday, February 27, 2012 @ 13:54:44
  Author: andrea
Revision: 151589

upgpkg: avogadro 1.0.3-5

boost rebuild

Added:
  avogadro/trunk/fix-opengl-headers.patch
Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |9 +--
 fix-opengl-headers.patch |   53 +
 2 files changed, 59 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-27 18:52:15 UTC (rev 151588)
+++ PKGBUILD2012-02-27 18:54:44 UTC (rev 151589)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -15,15 +15,18 @@
 install=avogadro.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
 'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-'fix-boost.patch')
+'fix-boost.patch'
+'fix-opengl-headers.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
  'aec516daab066c15326a9681f8f15abc'
- '46282e4709429447e44a0a54d51ad2ec')
+ '46282e4709429447e44a0a54d51ad2ec'
+ 'f420bfd22e3d5d8fcddc625cf5e711f6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/replace-qt4_automoc-with-qt4_wrap_cpp.patch
   patch -p1 -i ${srcdir}/fix-boost.patch
+  patch -p1 -i ${srcdir}/fix-opengl-headers.patch
 
   cd ${srcdir}
   mkdir build

Added: fix-opengl-headers.patch
===
--- fix-opengl-headers.patch(rev 0)
+++ fix-opengl-headers.patch2012-02-27 18:54:44 UTC (rev 151589)
@@ -0,0 +1,53 @@
+--- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.10585 
+
 avogadro-1.0.3/libavogadro/src/camera.cpp  2012-02-27 18:36:27.103053453 
+
+@@ -25,6 +25,8 @@
+ #include camera.h
+ #include glwidget.h
+ #include avogadro/molecule.h
++#include Eigen/LU
++#include GL/glu.h
+ 
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~2012-02-27 
18:37:28.535894209 +
 avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 
18:37:46.912413557 +
+@@ -42,6 +42,7 @@
+ #include QColor
+ #include QVarLengthArray
+ #include Eigen/Geometry
++#include GL/glu.h
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~   2012-02-27 
18:37:55.099014598 +
 avogadro-1.0.3/libavogadro/src/glwidget.cpp2012-02-27 
18:38:30.805395066 +
+@@ -70,6 +70,8 @@
+ 
+ #include openbabel/mol.h
+ 
++#include GL/glu.h
++
+ using namespace OpenBabel;
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~  2012-02-27 
18:36:53.646173944 +
 avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp   2012-02-27 
18:37:10.739370227 +
+@@ -36,6 +36,7 @@
+ #include QFile
+ #include QDebug
+ #include Eigen/Geometry
++#include GL/glu.h
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 
18:38:47.491928000 +
 avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp  2012-02-27 
18:39:05.735115136 +
+@@ -44,6 +44,8 @@
+ #include QComboBox
+ #include QDebug
+ 
++#include GL/glu.h
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;

[arch-commits] Commit in avogadro/trunk (PKGBUILD fix-boost.patch)

2011-11-29 Thread Andrea Scarpino 
Date: Tuesday, November 29, 2011 @ 13:38:06
  Author: andrea
Revision: 143834

Use the workaround here too

Modified:
  avogadro/trunk/PKGBUILD
  avogadro/trunk/fix-boost.patch

-+
 PKGBUILD|2 +-
 fix-boost.patch |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-29 18:35:55 UTC (rev 143833)
+++ PKGBUILD2011-11-29 18:38:06 UTC (rev 143834)
@@ -18,7 +18,7 @@
 'fix-boost.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
  '1b74d435a058062600bdb22174371fbc'
- '138801cb245f3d8f02019b85bab1a140')
+ '607ef5f4db5f2a193718f06b2bb295ed')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: fix-boost.patch
===
--- fix-boost.patch 2011-11-29 18:35:55 UTC (rev 143833)
+++ fix-boost.patch 2011-11-29 18:38:06 UTC (rev 143834)
@@ -9,3 +9,14 @@
  
  # you have to add link_directories before you add the target
  if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~  2011-11-29 
18:37:15.449506548 +
 avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt   2011-11-29 
18:37:52.729831744 +
+@@ -11,7 +11,7 @@
+ # use all cpp files in this directory
+ FILE(GLOB wrapper_SRCS *.cpp)
+ 
+-QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
++QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS 
-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+ ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
+ SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-11-29 Thread Andrea Scarpino 
Date: Tuesday, November 29, 2011 @ 15:03:28
  Author: andrea
Revision: 143837

Fix Qt mkspecs file path

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-29 19:49:27 UTC (rev 143836)
+++ PKGBUILD2011-11-29 20:03:28 UTC (rev 143837)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
 license=('GPL2')
-depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 
'python2-numpy')
+depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 
'python2-numpy')
 makedepends=('cmake' 'boost')
 install=avogadro.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
@@ -31,7 +31,8 @@
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
+-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+-DQT_MKSPECS_RELATIVE=share/qt/mkspecs
   make
 }

[arch-commits] Commit in avogadro/trunk (PKGBUILD avogadro.install)

2011-11-24 Thread Eric Bélanger 
Date: Thursday, November 24, 2011 @ 16:23:28
  Author: eric
Revision: 143490

Add .install file to run update-desktop-database

Added:
  avogadro/trunk/avogadro.install
Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 avogadro.install |   11 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-24 20:44:47 UTC (rev 143489)
+++ PKGBUILD2011-11-24 21:23:28 UTC (rev 143490)
@@ -12,11 +12,12 @@
 license=('GPL2')
 depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 
'python2-numpy')
 makedepends=('cmake' 'boost')
+install=avogadro.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('92c2702c1980f70fb6d87a1a58147911')
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -27,6 +28,6 @@
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
 }

Added: avogadro.install
===
--- avogadro.install(rev 0)
+++ avogadro.install2011-11-24 21:23:28 UTC (rev 143490)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-11-23 Thread Andrea Scarpino 
Date: Thursday, November 24, 2011 @ 02:54:06
  Author: andrea
Revision: 143265

Fix build with Python3 installed

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-24 07:48:26 UTC (rev 143264)
+++ PKGBUILD2011-11-24 07:54:06 UTC (rev 143265)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer:
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: Nick B Shirakawasuna at gmail _dot_com
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -20,7 +21,8 @@
   cd build
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
   make
 }

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-07-26 Thread Andrea Scarpino 
Date: Tuesday, July 26, 2011 @ 03:29:20
  Author: andrea
Revision: 132785

upgpkg: avogadro 1.0.3-3
boost rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-26 07:21:34 UTC (rev 132784)
+++ PKGBUILD2011-07-26 07:29:20 UTC (rev 132785)
@@ -4,7 +4,7 @@
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-05-24 Thread Andrea Scarpino 
Date: Tuesday, May 24, 2011 @ 09:18:50
  Author: andrea
Revision: 124796

upgpkg: avogadro 1.0.3-2
boost rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-24 13:10:31 UTC (rev 124795)
+++ PKGBUILD2011-05-24 13:18:50 UTC (rev 124796)
@@ -4,12 +4,12 @@
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=1
+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=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
+depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 
'python2-numpy')
 makedepends=('cmake' 'boost')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('92c2702c1980f70fb6d87a1a58147911')

[arch-commits] Commit in avogadro/trunk (PKGBUILD fix-pycapsule.patch sip-4.11.patch)

2011-04-26 Thread Andrea Scarpino 
Date: Tuesday, April 26, 2011 @ 05:43:00
  Author: andrea
Revision: 120742

upgpkg: avogadro 1.0.3-1
upstream release

Modified:
  avogadro/trunk/PKGBUILD
Deleted:
  avogadro/trunk/fix-pycapsule.patch
  avogadro/trunk/sip-4.11.patch

-+
 PKGBUILD|   23 ---
 fix-pycapsule.patch |   23 ---
 sip-4.11.patch  |   34 --
 3 files changed, 4 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-26 09:15:47 UTC (rev 120741)
+++ PKGBUILD2011-04-26 09:43:00 UTC (rev 120742)
@@ -3,33 +3,21 @@
 # Contributor: Nick B Shirakawasuna at gmail _dot_com
 
 pkgname=avogadro
-pkgver=1.0.1
-pkgrel=8
+pkgver=1.0.3
+pkgrel=1
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
 license=('GPL2')
 depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
-'sip-4.11.patch'
-'fix-pycapsule.patch')
-md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-'e78c3f96d0dc702947f75de1c094f580'
-'45b0f3be5913575311e92b74a5520966')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('92c2702c1980f70fb6d87a1a58147911')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/sip-4.11.patch
-  patch -Np1 -i ${srcdir}/fix-pycapsule.patch
-
   cd ${srcdir}
   mkdir build
   cd build
-
-  # use the cmake module in system to enable python 2.7 support
-  rm ../${pkgname}-${pkgver}/cmake/modules/FindPythonLibs.cmake
-
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr
@@ -39,7 +27,4 @@
 package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
-
-  install -Dm644 
${srcdir}/${pkgname}-${pkgver}/cmake/modules/FindAvogadro.cmake \
-${pkgdir}/usr/share/cmake-2.8/Modules/FindAvogadro.cmake
 }

Deleted: fix-pycapsule.patch
===
--- fix-pycapsule.patch 2011-04-26 09:15:47 UTC (rev 120741)
+++ fix-pycapsule.patch 2011-04-26 09:43:00 UTC (rev 120742)
@@ -1,23 +0,0 @@
 avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
17:31:22.0 +0100
-+++ avogadro-1.0.1-pycapsule/libavogadro/src/python/sip.cpp2010-11-23 
19:00:09.0 +
-@@ -62,12 +62,20 @@ bool init_sip_api()
- return false;
-   }
-   
-+#ifdef SIP_USE_PYCAPSULE
-+  if (!PyCapsule_IsValid(sip_capi_obj.ptr(), sip._C_API)) {
-+#else
-   if (!PyCObject_Check(sip_capi_obj.ptr())) {
-+#endif
- std::cout  The _C_API object in the sip python module is invalid.  
std::endl;
- return false;
-   }
- 
-+#ifdef SIP_USE_PYCAPSULE
-+  sip_API = reinterpret_castconst 
sipAPIDef*(PyCapsule_GetPointer(sip_capi_obj.ptr(), sip._C_API));
-+#else
-   sip_API = reinterpret_castconst 
sipAPIDef*(PyCObject_AsVoidPtr(sip_capi_obj.ptr()));
-+#endif
- 
-   return true;
- }

Deleted: sip-4.11.patch
===
--- sip-4.11.patch  2011-04-26 09:15:47 UTC (rev 120741)
+++ sip-4.11.patch  2011-04-26 09:43:00 UTC (rev 120742)
@@ -1,34 +0,0 @@
-diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake 
avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
 avogadro-1.0.1/cmake/modules/PythonDeps.cmake  2010-05-02 
18:31:22.0 +0200
-+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake   2010-09-14 
19:11:50.0 +0200
-@@ -59,10 +59,13 @@
-   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
- message(STATUS Found sip.h header...)
- execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
--if (${SIP_VERSION} VERSION_GREATER 4.8)
-+if (NOT ${SIP_VERSION} VERSION_LESS 4.11)
-+  message(STATUS using sip version 4.11 or above...)
-+  add_definitions( -DSIP_4_11 -DSIP_4_8 )
-+elseif (NOT ${SIP_VERSION} VERSION_LESS 4.8)
-   message(STATUS using sip version 4.8 or above...)
-   add_definitions( -DSIP_4_8 )
--endif (${SIP_VERSION} VERSION_GREATER 4.8)
-+endif (NOT ${SIP_VERSION} VERSION_LESS 4.11)
-   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
- message(STATUS sip.h header NOT found - Python support disabled)
-   #  message(STATUS debian/ubuntu: install the python-sip4-dev package.)
-diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp 
avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
 avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
18:31:22.0 +0200
-+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp   2010-09-14 
19:13:31.0 +0200
-@@ -204,7 +204,11 @@
- sipWrapper *wrapper = reinterpret_castsipWrapper*(obj_ptr);
- #endif
- // return the C++ pointer
-+#ifdef SIP_4_11
-+return

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-03-02 Thread Andrea Scarpino 
Date: Wednesday, March 2, 2011 @ 16:41:10
  Author: andrea
Revision: 111981

upgpkg: avogadro 1.0.1-8
boost 1.46

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-02 21:29:43 UTC (rev 111980)
+++ PKGBUILD2011-03-02 21:41:10 UTC (rev 111981)
@@ -4,7 +4,7 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=7
+pkgrel=8
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-01-19 Thread Andrea Scarpino 
Date: Wednesday, January 19, 2011 @ 07:04:19
  Author: andrea
Revision: 106819

upgpkg: avogadro 1.0.1-7
fix to depends on python2-qt

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-19 11:35:04 UTC (rev 106818)
+++ PKGBUILD2011-01-19 12:04:19 UTC (rev 106819)
@@ -4,7 +4,7 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2011-01-06 Thread Andrea Scarpino 
Date: Thursday, January 6, 2011 @ 11:12:22
  Author: andrea
Revision: 105117

upgpkg: avogadro 1.0.1-6
install FindAvogadro.cmake (FS#22340)

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-06 15:32:26 UTC (rev 105116)
+++ PKGBUILD2011-01-06 16:12:22 UTC (rev 105117)
@@ -4,7 +4,7 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -39,4 +39,7 @@
 package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
+
+  install -Dm644 
${srcdir}/${pkgname}-${pkgver}/cmake/modules/FindAvogadro.cmake \
+${pkgdir}/usr/share/cmake-2.8/Modules/FindAvogadro.cmake
 }

[arch-commits] Commit in avogadro/trunk (PKGBUILD fix-pycapsule.patch sip-4.11.patch)

2010-12-18 Thread Andrea Scarpino 
Date: Saturday, December 18, 2010 @ 09:11:33
  Author: andrea
Revision: 103345

Made it working with sip 4.11 (FS#21569)

Added:
  avogadro/trunk/fix-pycapsule.patch
Modified:
  avogadro/trunk/PKGBUILD
  avogadro/trunk/sip-4.11.patch

-+
 PKGBUILD|   13 -
 fix-pycapsule.patch |   23 +++
 sip-4.11.patch  |   28 
 3 files changed, 55 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-18 14:11:27 UTC (rev 103344)
+++ PKGBUILD2010-12-18 14:11:33 UTC (rev 103345)
@@ -4,21 +4,24 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
 license=('GPL2')
-depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
+depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
-'sip-4.11.patch')
+'sip-4.11.patch'
+'fix-pycapsule.patch')
 md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-'5202204b1381cf298a583aab06d9cca4')
+'e78c3f96d0dc702947f75de1c094f580'
+'45b0f3be5913575311e92b74a5520966')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/sip-4.11.patch
+  patch -Np1 -i ${srcdir}/sip-4.11.patch
+  patch -Np1 -i ${srcdir}/fix-pycapsule.patch
 
   cd ${srcdir}
   mkdir build

Added: fix-pycapsule.patch
===
--- fix-pycapsule.patch (rev 0)
+++ fix-pycapsule.patch 2010-12-18 14:11:33 UTC (rev 103345)
@@ -0,0 +1,23 @@
+--- avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
17:31:22.0 +0100
 avogadro-1.0.1-pycapsule/libavogadro/src/python/sip.cpp2010-11-23 
19:00:09.0 +
+@@ -62,12 +62,20 @@ bool init_sip_api()
+ return false;
+   }
+   
++#ifdef SIP_USE_PYCAPSULE
++  if (!PyCapsule_IsValid(sip_capi_obj.ptr(), sip._C_API)) {
++#else
+   if (!PyCObject_Check(sip_capi_obj.ptr())) {
++#endif
+ std::cout  The _C_API object in the sip python module is invalid.  
std::endl;
+ return false;
+   }
+ 
++#ifdef SIP_USE_PYCAPSULE
++  sip_API = reinterpret_castconst 
sipAPIDef*(PyCapsule_GetPointer(sip_capi_obj.ptr(), sip._C_API));
++#else
+   sip_API = reinterpret_castconst 
sipAPIDef*(PyCObject_AsVoidPtr(sip_capi_obj.ptr()));
++#endif
+ 
+   return true;
+ }

Modified: sip-4.11.patch
===
--- sip-4.11.patch  2010-12-18 14:11:27 UTC (rev 103344)
+++ sip-4.11.patch  2010-12-18 14:11:33 UTC (rev 103345)
@@ -1,11 +1,31 @@
 libavogadro/src/python/sip.cpp~2010-05-02 18:31:22.0 +0200
-+++ libavogadro/src/python/sip.cpp 2010-09-14 19:13:31.0 +0200
+diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake 
avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
+--- avogadro-1.0.1/cmake/modules/PythonDeps.cmake  2010-05-02 
18:31:22.0 +0200
 avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake   2010-09-14 
19:11:50.0 +0200
+@@ -59,10 +59,13 @@
+   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
+ message(STATUS Found sip.h header...)
+ execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
+-if (${SIP_VERSION} VERSION_GREATER 4.8)
++if (NOT ${SIP_VERSION} VERSION_LESS 4.11)
++  message(STATUS using sip version 4.11 or above...)
++  add_definitions( -DSIP_4_11 -DSIP_4_8 )
++elseif (NOT ${SIP_VERSION} VERSION_LESS 4.8)
+   message(STATUS using sip version 4.8 or above...)
+   add_definitions( -DSIP_4_8 )
+-endif (${SIP_VERSION} VERSION_GREATER 4.8)
++endif (NOT ${SIP_VERSION} VERSION_LESS 4.11)
+   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
+ message(STATUS sip.h header NOT found - Python support disabled)
+   #  message(STATUS debian/ubuntu: install the python-sip4-dev package.)
+diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp 
avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
+--- avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
18:31:22.0 +0200
 avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp   2010-09-14 
19:13:31.0 +0200
 @@ -204,7 +204,11 @@
  sipWrapper *wrapper = reinterpret_castsipWrapper*(obj_ptr);
  #endif
  // return the C++ pointer
-+#if SIP_API_MAJOR_NR = 8
-+return wrapper-data;
++#ifdef SIP_4_11
++return sip_API-api_get_address(wrapper);
 +#else
  return wrapper-u.cppPtr;
 +#endif

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2010-11-22 Thread Andrea Scarpino 
Date: Monday, November 22, 2010 @ 18:25:14
  Author: andrea
Revision: 100347

upgpkg: avogadro 1.0.1-4
boost rebuild

Modified:
  avogadro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-22 23:20:17 UTC (rev 100346)
+++ PKGBUILD2010-11-22 23:25:14 UTC (rev 100347)
@@ -4,12 +4,12 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-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=('openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
+depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
 makedepends=('cmake' 'boost')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
 'sip-4.11.patch')

[arch-commits] Commit in avogadro/trunk (PKGBUILD sip-4.11.patch)

2010-11-17 Thread Andrea Scarpino 
Date: Wednesday, November 17, 2010 @ 11:42:36
  Author: andrea
Revision: 99787

update sip patch with the patch applied upstream

Modified:
  avogadro/trunk/PKGBUILD
  avogadro/trunk/sip-4.11.patch

+
 PKGBUILD   |6 +++---
 sip-4.11.patch |   28 
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-17 16:37:24 UTC (rev 99786)
+++ PKGBUILD2010-11-17 16:42:36 UTC (rev 99787)
@@ -9,16 +9,16 @@
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
 license=('GPL2')
-depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
+depends=('openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
 makedepends=('cmake' 'boost')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
 'sip-4.11.patch')
 md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-'e78c3f96d0dc702947f75de1c094f580')
+'5202204b1381cf298a583aab06d9cca4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/sip-4.11.patch
+  patch -Np0 -i ${srcdir}/sip-4.11.patch
 
   cd ${srcdir}
   mkdir build

Modified: sip-4.11.patch
===
--- sip-4.11.patch  2010-11-17 16:37:24 UTC (rev 99786)
+++ sip-4.11.patch  2010-11-17 16:42:36 UTC (rev 99787)
@@ -1,31 +1,11 @@
-diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake 
avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
 avogadro-1.0.1/cmake/modules/PythonDeps.cmake  2010-05-02 
18:31:22.0 +0200
-+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake   2010-09-14 
19:11:50.0 +0200
-@@ -59,10 +59,13 @@
-   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
- message(STATUS Found sip.h header...)
- execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
--if (${SIP_VERSION} VERSION_GREATER 4.8)
-+if (NOT ${SIP_VERSION} VERSION_LESS 4.11)
-+  message(STATUS using sip version 4.11 or above...)
-+  add_definitions( -DSIP_4_11 -DSIP_4_8 )
-+elseif (NOT ${SIP_VERSION} VERSION_LESS 4.8)
-   message(STATUS using sip version 4.8 or above...)
-   add_definitions( -DSIP_4_8 )
--endif (${SIP_VERSION} VERSION_GREATER 4.8)
-+endif (NOT ${SIP_VERSION} VERSION_LESS 4.11)
-   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
- message(STATUS sip.h header NOT found - Python support disabled)
-   #  message(STATUS debian/ubuntu: install the python-sip4-dev package.)
-diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp 
avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
 avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
18:31:22.0 +0200
-+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp   2010-09-14 
19:13:31.0 +0200
+--- libavogadro/src/python/sip.cpp~2010-05-02 18:31:22.0 +0200
 libavogadro/src/python/sip.cpp 2010-09-14 19:13:31.0 +0200
 @@ -204,7 +204,11 @@
  sipWrapper *wrapper = reinterpret_castsipWrapper*(obj_ptr);
  #endif
  // return the C++ pointer
-+#ifdef SIP_4_11
-+return sip_API-api_get_address(wrapper);
++#if SIP_API_MAJOR_NR = 8
++return wrapper-data;
 +#else
  return wrapper-u.cppPtr;
 +#endif

[arch-commits] Commit in avogadro/trunk (PKGBUILD)

2010-11-15 Thread Andrea Scarpino 
Date: Monday, November 15, 2010 @ 05:35:56
  Author: andrea
Revision: 99534

upgpkg: avogadro 1.0.1-3
openbabel rebuild (FS#21700)

Modified:
  avogadro/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-15 05:45:22 UTC (rev 99533)
+++ PKGBUILD2010-11-15 10:35:56 UTC (rev 99534)
@@ -4,7 +4,7 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc=An advanced molecular editor based on Qt
 arch=('i686' 'x86_64')
 url=http://avogadro.openmolecules.net/wiki/Main_Page;
@@ -12,9 +12,9 @@
 depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
 makedepends=('cmake' 'boost')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
-   'sip-4.11.patch')
+'sip-4.11.patch')
 md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-   'e78c3f96d0dc702947f75de1c094f580')
+'e78c3f96d0dc702947f75de1c094f580')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}


Property changes on: avogadro/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

[arch-commits] Commit in avogadro/trunk (PKGBUILD sip-4.11.patch)

2010-11-02 Thread Andrea Scarpino 
Date: Tuesday, November 2, 2010 @ 10:35:42
  Author: andrea
Revision: 97995

rebuild for sip 4.11 (FS#21569)

Added:
  avogadro/trunk/sip-4.11.patch
Modified:
  avogadro/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 sip-4.11.patch |   34 ++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-02 13:40:28 UTC (rev 97994)
+++ PKGBUILD2010-11-02 14:35:42 UTC (rev 97995)
@@ -4,17 +4,22 @@
 
 pkgname=avogadro
 pkgver=1.0.1
-pkgrel=1
+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=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
 makedepends=('cmake' 'boost')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('0d5c391197101f0aab7be6b59f81e6fd')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+   'sip-4.11.patch')
+md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
+   'e78c3f96d0dc702947f75de1c094f580')
 
 build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/sip-4.11.patch
+
   cd ${srcdir}
   mkdir build
   cd build

Added: sip-4.11.patch
===
--- sip-4.11.patch  (rev 0)
+++ sip-4.11.patch  2010-11-02 14:35:42 UTC (rev 97995)
@@ -0,0 +1,34 @@
+diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake 
avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
+--- avogadro-1.0.1/cmake/modules/PythonDeps.cmake  2010-05-02 
18:31:22.0 +0200
 avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake   2010-09-14 
19:11:50.0 +0200
+@@ -59,10 +59,13 @@
+   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
+ message(STATUS Found sip.h header...)
+ execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
+-if (${SIP_VERSION} VERSION_GREATER 4.8)
++if (NOT ${SIP_VERSION} VERSION_LESS 4.11)
++  message(STATUS using sip version 4.11 or above...)
++  add_definitions( -DSIP_4_11 -DSIP_4_8 )
++elseif (NOT ${SIP_VERSION} VERSION_LESS 4.8)
+   message(STATUS using sip version 4.8 or above...)
+   add_definitions( -DSIP_4_8 )
+-endif (${SIP_VERSION} VERSION_GREATER 4.8)
++endif (NOT ${SIP_VERSION} VERSION_LESS 4.11)
+   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
+ message(STATUS sip.h header NOT found - Python support disabled)
+   #  message(STATUS debian/ubuntu: install the python-sip4-dev package.)
+diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp 
avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
+--- avogadro-1.0.1/libavogadro/src/python/sip.cpp  2010-05-02 
18:31:22.0 +0200
 avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp   2010-09-14 
19:13:31.0 +0200
+@@ -204,7 +204,11 @@
+ sipWrapper *wrapper = reinterpret_castsipWrapper*(obj_ptr);
+ #endif
+ // return the C++ pointer
++#ifdef SIP_4_11
++return sip_API-api_get_address(wrapper);
++#else
+ return wrapper-u.cppPtr;
++#endif
+   }
+ 
+   QClass_converters()