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

[Antonio Rojas]

    Date: Thursday, June 16, 2016 @ 07:32:44
  Author: arojas
Revision: 270005

Update to 1.2.0

Added:
  avogadro/trunk/avogadro-fix-linking.patch
  avogadro/trunk/avogadro-glibc2.23.patch
Modified:
  avogadro/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   19 ++++++++++++-------
 avogadro-fix-linking.patch |   14 ++++++++++++++
 avogadro-glibc2.23.patch   |   18 ++++++++++++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-16 06:38:57 UTC (rev 270004)
+++ PKGBUILD	2016-06-16 07:32:44 UTC (rev 270005)
@@ -4,8 +4,8 @@
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
-pkgver=1.1.1
-pkgrel=9
+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"
@@ -12,10 +12,12 @@
 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')
+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
@@ -22,12 +24,15 @@
 
   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
 
-  export CXXFLAGS="$CXXFLAGS -lX11 -lopenbabel"
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \

Added: avogadro-fix-linking.patch
===================================================================
--- avogadro-fix-linking.patch	                        (rev 0)
+++ avogadro-fix-linking.patch	2016-06-16 07:32:44 UTC (rev 270005)
@@ -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:

Added: avogadro-glibc2.23.patch
===================================================================
--- avogadro-glibc2.23.patch	                        (rev 0)
+++ avogadro-glibc2.23.patch	2016-06-16 07:32:44 UTC (rev 270005)
@@ -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);
+         }
+     }