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

Antonio Rojas arojas at archlinux.org
Thu Jul 7 22:39:29 UTC 2016


    Date: Thursday, July 7, 2016 @ 22:39:29
  Author: arojas
Revision: 271152

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

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

-----------------------------------------+
 /PKGBUILD                               |   94 +++++++++++++++++++++++
 /avogadro-fix-linking.patch             |   28 +++++++
 /avogadro-glibc2.23.patch               |   36 +++++++++
 /boost153.patch                         |  120 ++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD                     |   47 -----------
 extra-i686/avogadro-fix-linking.patch   |   14 ---
 extra-i686/avogadro-glibc2.23.patch     |   18 ----
 extra-i686/boost153.patch               |   60 ---------------
 extra-x86_64/PKGBUILD                   |   47 -----------
 extra-x86_64/avogadro-fix-linking.patch |   14 ---
 extra-x86_64/avogadro-glibc2.23.patch   |   18 ----
 extra-x86_64/boost153.patch             |   60 ---------------
 12 files changed, 278 insertions(+), 278 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-i686/PKGBUILD	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.2.0
-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=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2')
-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/extra-i686/PKGBUILD (from rev 271151, avogadro/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-07-07 22:39:29 UTC (rev 271152)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
+
+pkgname=avogadro
+pkgver=1.2.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=('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
+}

Deleted: extra-i686/avogadro-fix-linking.patch
===================================================================
--- extra-i686/avogadro-fix-linking.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-i686/avogadro-fix-linking.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,14 +0,0 @@
-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.000000000 -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/extra-i686/avogadro-fix-linking.patch (from rev 271151, avogadro/trunk/avogadro-fix-linking.patch)
===================================================================
--- extra-i686/avogadro-fix-linking.patch	                        (rev 0)
+++ extra-i686/avogadro-fix-linking.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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.000000000 -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:

Deleted: extra-i686/avogadro-glibc2.23.patch
===================================================================
--- extra-i686/avogadro-glibc2.23.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-i686/avogadro-glibc2.23.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,18 +0,0 @@
---- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig	2016-06-16 06:36:58.888214167 +0000
-+++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c	2016-06-16 06:37:19.091459100 +0000
-@@ -67,13 +67,13 @@
-         }
-         case 2 : {
-             //o->v = dpolynomial[m+l];
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
-             break;
-         }
-         default : {
-             char t = 'f' - 3 + l;
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
-         }
-     }

Copied: avogadro/repos/extra-i686/avogadro-glibc2.23.patch (from rev 271151, avogadro/trunk/avogadro-glibc2.23.patch)
===================================================================
--- extra-i686/avogadro-glibc2.23.patch	                        (rev 0)
+++ extra-i686/avogadro-glibc2.23.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -0,0 +1,18 @@
+--- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig	2016-06-16 06:36:58.888214167 +0000
++++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c	2016-06-16 06:37:19.091459100 +0000
+@@ -67,13 +67,13 @@
+         }
+         case 2 : {
+             //o->v = dpolynomial[m+l];
+-            char *d = (signbit(m) == 1 ? "-" : "+");
++            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+             snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
+             break;
+         }
+         default : {
+             char t = 'f' - 3 + l;
+-            char *d = (signbit(m) == 1 ? "-" : "+");
++            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+             snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
+         }
+     }

Deleted: extra-i686/boost153.patch
===================================================================
--- extra-i686/boost153.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-i686/boost153.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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 271151, avogadro/trunk/boost153.patch)
===================================================================
--- extra-i686/boost153.patch	                        (rev 0)
+++ extra-i686/boost153.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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-07-07 22:38:53 UTC (rev 271151)
+++ extra-x86_64/PKGBUILD	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.2.0
-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=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2')
-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/extra-x86_64/PKGBUILD (from rev 271151, avogadro/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-07-07 22:39:29 UTC (rev 271152)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
+
+pkgname=avogadro
+pkgver=1.2.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=('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
+}

Deleted: extra-x86_64/avogadro-fix-linking.patch
===================================================================
--- extra-x86_64/avogadro-fix-linking.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-x86_64/avogadro-fix-linking.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,14 +0,0 @@
-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.000000000 -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/extra-x86_64/avogadro-fix-linking.patch (from rev 271151, avogadro/trunk/avogadro-fix-linking.patch)
===================================================================
--- extra-x86_64/avogadro-fix-linking.patch	                        (rev 0)
+++ extra-x86_64/avogadro-fix-linking.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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.000000000 -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:

Deleted: extra-x86_64/avogadro-glibc2.23.patch
===================================================================
--- extra-x86_64/avogadro-glibc2.23.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-x86_64/avogadro-glibc2.23.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -1,18 +0,0 @@
---- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig	2016-06-16 06:36:58.888214167 +0000
-+++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c	2016-06-16 06:37:19.091459100 +0000
-@@ -67,13 +67,13 @@
-         }
-         case 2 : {
-             //o->v = dpolynomial[m+l];
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
-             break;
-         }
-         default : {
-             char t = 'f' - 3 + l;
--            char *d = (signbit(m) == 1 ? "-" : "+");
-+            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
-             snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
-         }
-     }

Copied: avogadro/repos/extra-x86_64/avogadro-glibc2.23.patch (from rev 271151, avogadro/trunk/avogadro-glibc2.23.patch)
===================================================================
--- extra-x86_64/avogadro-glibc2.23.patch	                        (rev 0)
+++ extra-x86_64/avogadro-glibc2.23.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -0,0 +1,18 @@
+--- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig	2016-06-16 06:36:58.888214167 +0000
++++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c	2016-06-16 06:37:19.091459100 +0000
+@@ -67,13 +67,13 @@
+         }
+         case 2 : {
+             //o->v = dpolynomial[m+l];
+-            char *d = (signbit(m) == 1 ? "-" : "+");
++            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+             snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
+             break;
+         }
+         default : {
+             char t = 'f' - 3 + l;
+-            char *d = (signbit(m) == 1 ? "-" : "+");
++            char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+             snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
+         }
+     }

Deleted: extra-x86_64/boost153.patch
===================================================================
--- extra-x86_64/boost153.patch	2016-07-07 22:38:53 UTC (rev 271151)
+++ extra-x86_64/boost153.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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 271151, avogadro/trunk/boost153.patch)
===================================================================
--- extra-x86_64/boost153.patch	                        (rev 0)
+++ extra-x86_64/boost153.patch	2016-07-07 22:39:29 UTC (rev 271152)
@@ -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