academic/avogadro: Updated for version 1.2.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

1 files changed, 13 insertions, 18 deletions

diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild
index 070bf3f192..481347fe3c 100644
--- a/academic/avogadro/avogadro.SlackBuild
+++ b/academic/avogadro/avogadro.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Avogadro
 
-# Copyright 2010-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avogadro
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,30 +60,23 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix gcc-4.7.x build issues.
-patch -p1 < $CWD/gcc-4.7.patch
-# Fix boost 1.53 build issues.
-patch -p1 < $CWD/boost-1.53.patch
 # Fix manpage directory.
 sed -i 's|share/man|man|' doc/CMakeLists.txt
+# Fix install directory and linking for libmsym library.
+patch -p1 < $CWD/avogadro-1.2.0-libmsym.patch
 
-# Fix eigen3 support (thanks slack_jack, ponce and Fedora)
-# http://pkgs.fedoraproject.org/cgit/avogadro.git/plain/avogadro-1.1.1-eigen3.patch
-patch -p1 < $CWD/avogadro-1.1.1-eigen3.patch
-
-# Fix underlinking (gcc-5.2) thanks Fedora
-patch -p1 < $CWD/avogadro-cmake-3.2.patch
-# Fix more underlinking (gcc-5.3)
-SLKCFLAGS="$SLKCFLAGS -lopenbabel"
+# fix build (with recent swig/linker/python?)
+# http://pkgs.fedoraproject.org/cgit/rpms/avogadro.git/tree/avogadro-1.1.1-python_openbabel.patch
+patch -p1 < $CWD/avogadro-1.1.1-python_openbabel.patch
 
 mkdir -p build
 cd build
@@ -96,6 +89,8 @@ cd build
     -DCMAKE_SKIP_RPATH=YES \
     -DENABLE_GLSL:BOOL=ON \
     -DENABLE_UPDATE_CHECKER=OFF \
+    -DENABLE_VERSIONED_PLUGIN_DIR:BOOL=OFF \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
     -DQT_MKSPECS_RELATIVE=lib${LIBDIRSUFFIX}/qt/mkspecs \
     -DCMAKE_BUILD_TYPE=Release ..
 
@@ -103,14 +98,14 @@ cd build
   make install DESTDIR=$PKG
 cd -
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL README \
+  AUTHORS COPYING INSTALL README \
   libavogadro/src/extensions/gl2ps/{COPYING*,*.txt,*.pdf} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild