Reworked PKGBUILD, added new dependencies, removed errors

2 files changed, 54 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de27404076e3..7c9236b139e1 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elmerfem
 	pkgdesc = A finite element software for multiphysical problems
 	pkgver = 8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.elmerfem.org
 	arch = x86_64
 	license = GPL
@@ -9,9 +9,10 @@ pkgbase = elmerfem
 	makedepends = cmake
 	depends = arpack
 	depends = blas
-	depends = qt5-base
 	depends = qt5-script
-	depends = glu
+	depends = netcdf-fortran
+	depends = mmg3d
+	depends = paraview
 	conflicts = elmerfem-git
 	options = !emptydirs
 	options = !makeflags
diff --git a/PKGBUILD b/PKGBUILD
index 53653441bc77..4fd85a765f5a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,57 +4,69 @@
 
 pkgname=elmerfem
 pkgver=8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A finite element software for multiphysical problems"
 arch=('x86_64')
 url="http://www.elmerfem.org"
 license=('GPL')
-depends=('arpack' 'blas' 'qt5-base' 'qt5-script' 'glu')
+depends=('arpack' 'blas' 'qt5-script' 'netcdf-fortran' 'mmg3d' 'paraview')
 makedepends=('gcc-fortran' 'cmake')
 conflicts=('elmerfem-git')
 options=(!emptydirs !makeflags)
 source=("https://github.com/ElmerCSC/$pkgname/archive/release-$pkgver.tar.gz"
         "$pkgname.desktop")
 sha256sums=('cc3ce807d76798361592cc14952cdc3db1ad8f9bac038017514033ce9badc5b3'
-            'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca')            
-            
+            'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca')
+
+prepare() {
+  cd "$srcdir/$pkgname-release-$pkgver"
+  mkdir ../build
+  sed -i 's/1 depth/1 ${depth}/g' fem/tests/CMakeLists.txt
+}
+
 build() {
-    mkdir $srcdir/$pkgname-release-$pkgver/bld
-    cd $srcdir/$pkgname-release-$pkgver/bld
-    cmake .. \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DELMER_INSTALL_LIB_DIR=/usr/lib \
-            -DWITH_CONTRIB=ON \
-            -DWITH_ELMERGUI=ON \
-            -DWITH_ElmerIce=ON \
-            -DWITH_LUA=ON \
-            -DWITH_MATC=ON \
-            -DWITH_MPI=ON \
-            -DWITH_OpenMP=ON \
-            -DWITH_QT5=ON \
-            -DWITH_ScatteredDataInterpolator=ON
-    make all
+  cd "$srcdir/build"
+  cmake ../$pkgname-release-$pkgver \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DELMER_INSTALL_LIB_DIR=/usr/lib \
+        -DWITH_CONTRIB=ON \
+        -DWITH_ELMERGUI=ON \
+        -DWITH_ElmerIce=ON \
+        -DWITH_LUA=ON \
+        -DWITH_MATC=ON \
+        -DWITH_MPI=ON \
+        -DWITH_OpenMP=ON \
+        -DWITH_QT5=ON \
+        -DWITH_ScatteredDataInterpolator=ON \
+        -DWITH_PARAVIEW=ON
+  make all
 }
 
+# check() {
+#   cd "$srcdir/build"
+#   export PATH=$PATH:$PWD/fem/src
+#   ctest -j$( grep -c ^processor /proc/cpuinfo )
+# }
 
 package() {
-    cd $srcdir/$pkgname-release-$pkgver/bld
-    make DESTDIR=$pkgdir install
-    
-    # Remove unecessary libraries    
-    rm -rf -- $pkgdir/usr/lib/{*.a,*arpack.so,ElmerGUI} 
-    
-    #Create directories
-    install -dv $pkgdir/usr/share/applications
-    install -dv $pkgdir/usr/share/pixmaps
-    install -dv $pkgdir/usr/share/licenses/$pkgname
-    
-    #Icon and desktop files
-    install -D -m644 ../ElmerGUI/Application/images/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications
-
-    #Clean up and move stuff in place
-    cp $pkgdir/usr/share/ElmerGUI/edf-extra/* $pkgdir/usr/share/ElmerGUI/edf
-    mv $pkgdir/usr/share/ElmerGUI/license_texts/GPL_EXCEPTION $pkgdir/usr/share/licenses/$pkgname
-    rm $pkgdir/usr/share/ElmerGUI/license_texts/*
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+  cd "$pkgdir/usr"
+  
+  # Remove unecessary libraries
+  rm -rf -- lib/{*.a,*arpack.so,ElmerGUI}
+
+  #Create directories
+  install -dv share/applications
+  install -dv share/pixmaps
+  install -dv share/licenses/$pkgname
+
+  #Icon and desktop files
+  install -D -m644 "$srcdir/$pkgname-release-$pkgver/ElmerGUI/Application/images/logo.png" share/pixmaps/$pkgname.png
+  install -D -m644 "$srcdir/$pkgname.desktop" share/applications
+
+  #Clean up and move stuff in place
+  cp share/ElmerGUI/edf-extra/* share/ElmerGUI/edf
+  mv share/ElmerGUI/license_texts/GPL_EXCEPTION share/licenses/$pkgname
+  rm share/ElmerGUI/license_texts/*
 }