Updated to 8.4

5 files changed, 50 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cadc4f3483b..de27404076e3 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,24 @@
-# Generated by mksrcinfo v8
-# Sun May 15 18:22:25 UTC 2016
 pkgbase = elmerfem
-	pkgdesc = Simulation tool for CFD, FEM, electromagnetics, heat transfer and others featuring a PDE solver.
-	pkgver = 8.2
-	pkgrel = 2
-	url = http://www.csc.fi/english/pages/elmer
-	arch = i686
+	pkgdesc = A finite element software for multiphysical problems
+	pkgver = 8.4
+	pkgrel = 1
+	url = http://www.elmerfem.org
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-fortran
 	makedepends = cmake
-	depends = qwt
-	depends = vtk-qt4
 	depends = arpack
+	depends = blas
+	depends = qt5-base
+	depends = qt5-script
 	depends = glu
-	depends = tk
-	depends = paraview-salome
 	conflicts = elmerfem-git
 	options = !emptydirs
 	options = !makeflags
-	source = https://github.com/ElmerCSC/elmerfem/archive/release-8.2.tar.gz
+	source = https://github.com/ElmerCSC/elmerfem/archive/release-8.4.tar.gz
 	source = elmerfem.desktop
-	source = cmake_vtk.patch
-	source = elmerfem.sh
-	sha256sums = ed4c87895c76003dd81faa464b6d0f38225d43e584f75290df21df629d0a4ecc
-	sha256sums = d2e9f6f2ced11d845149721371ca15d15f9983a34eedc35a88263f8368f721ab
-	sha256sums = 6012ac4784bcaa24f3bc408ae0bacaf7e9d7f8708875c937232da29ddcbbcc58
-	sha256sums = 394b5c5d73e453397f4fdcf6e5bdc63349721607352ca5af61a80c1cc1bb93b4
+	sha256sums = cc3ce807d76798361592cc14952cdc3db1ad8f9bac038017514033ce9badc5b3
+	sha256sums = f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca
 
 pkgname = elmerfem
 
diff --git a/PKGBUILD b/PKGBUILD
index d67e47630190..53653441bc77 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,87 +1,60 @@
-# Maintainer:  saxonbeta <saxonbeta [[at]] gmail _dot com
+# Maintainer: Anton Kudelin <kudelin at protonmail dot com>
+# Contributor:  saxonbeta <saxonbeta [[at]] gmail _dot com
 # Contributor: Randy Heydon <randy dot heydon at clockworklab dot net>
 
 pkgname=elmerfem
-pkgver=8.2
-pkgrel=2
-pkgdesc="Simulation tool for CFD, FEM, electromagnetics, heat transfer and others featuring a PDE solver."
-arch=('i686' 'x86_64')
-url="http://www.csc.fi/english/pages/elmer"
+pkgver=8.4
+pkgrel=1
+pkgdesc="A finite element software for multiphysical problems"
+arch=('x86_64')
+url="http://www.elmerfem.org"
 license=('GPL')
-depends=('qwt' 'vtk-qt4' 'arpack' 'glu' 'tk' 'paraview-salome')
+depends=('arpack' 'blas' 'qt5-base' 'qt5-script' 'glu')
 makedepends=('gcc-fortran' 'cmake')
 conflicts=('elmerfem-git')
 options=(!emptydirs !makeflags)
-
-#Use custom VTK-QT4 package
-_VTK_ROOT_DIR=/opt/vtk-qt4
-
 source=("https://github.com/ElmerCSC/$pkgname/archive/release-$pkgver.tar.gz"
-        "$pkgname.desktop"
-        "cmake_vtk.patch"
-        "elmerfem.sh")
-sha256sums=('ed4c87895c76003dd81faa464b6d0f38225d43e584f75290df21df629d0a4ecc'
-            'd2e9f6f2ced11d845149721371ca15d15f9983a34eedc35a88263f8368f721ab'
-            '6012ac4784bcaa24f3bc408ae0bacaf7e9d7f8708875c937232da29ddcbbcc58'
-            '394b5c5d73e453397f4fdcf6e5bdc63349721607352ca5af61a80c1cc1bb93b4')
-
-
-prepare() {
-    cd "$srcdir/$pkgname-release-$pkgver"
-    patch -p1 < "${srcdir}/cmake_vtk.patch"
-}
-            
+        "$pkgname.desktop")
+sha256sums=('cc3ce807d76798361592cc14952cdc3db1ad8f9bac038017514033ce9badc5b3'
+            'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca')            
             
 build() {
-    cd "$srcdir/$pkgname-release-$pkgver"
-
-    
-    _LDFLAGS="-L${_VTK_ROOT_DIR}/lib -lX11 "
-    _LDFLAGS+=$LDFLAGS
-    LDFLAGS=$_LDFLAGS
-	export LDFLAGS
-    cmake  \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DELMER_INSTALL_LIB_DIR=/usr/lib \
-        -DELMER_SOLVER_HOME=/usr/share/elmersolver \
-        -DWITH_MPI:BOOL=TRUE \
-        -DWITH_OpenMP:BOOL=TRUE \
-        -DWITH_QWT:BOOL=TRUE \
-        -DWITH_VTK:BOOL=TRUE \
-        -DWITH_PARAVIEW:BOOL=TRUE \
-        -DWITH_ELMERGUI:BOOL=TRUE \
-        -DWITH_ELMERGUILOGGER:BOOL=TRUE \
-        -DWITH_ELMERPOST:BOOL=TRUE \
-        -DVTK_ROOT_DIR:PATH=$_VTK_ROOT_DIR
+    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
 }
 
 
 package() {
-    cd "$srcdir/$pkgname-release-$pkgver"
-    make DESTDIR="$pkgdir" install
+    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}/"
+    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/"
-    
-    #Enable parallel solver
-    ln -s ElmerSolver_mpi "${pkgdir}/usr/bin/ElmerSolver"
-    
-    #ld configuration
-    install -D -m 755 "${srcdir}/elmerfem.sh" "${pkgdir}/etc/profile.d/elmerfem.sh"
+    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
-    rm -- "$pkgdir"/usr/lib/{libparpack.so,libarpack.so}
-    mv "$pkgdir"/usr/share/elmersolver/lib/*.so "$pkgdir"/usr/lib
-    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/*
+    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/*
 }
- 
diff --git a/cmake_vtk.patch b/cmake_vtk.patch
deleted file mode 100644
index 1c112f19ffef..000000000000
--- a/cmake_vtk.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-+++ a/ElmerGUI/CMakeLists.txt	2016-04-29 08:56:30.041926903 -0500
-@@ -8,6 +8,7 @@
- SET(WITH_MATC FALSE CACHE BOOL "ElmerGUI: Use MATC for internal operations in postprocessing?")
- SET(WITH_PARAVIEW FALSE CACHE BOOL "ElmerGUI: Use ParaView for postprocessing?")
- SET(WITH_VTK FALSE CACHE BOOL "ElmerGUI: Use VTK for postprocessing?")
-+SET(VTK_ROOT_DIR CACHE PATH "ElmerGUI: Custom VTK installation directory")
- SET(WITH_QWT FALSE CACHE BOOL "ElmerGUI: Use QWT for convergence monitor?")
- SET(WITH_ELMERGUILOGGER FALSE CACHE BOOL "ElmerGUI: Include ElmerGUIlogger")
- 
-@@ -55,7 +56,12 @@
- 
- IF(WITH_VTK)
-   ADD_DEFINITIONS(-DEG_VTK)
--  FIND_PACKAGE(VTK REQUIRED)
-+  IF(VTK_ROOT_DIR)
-+    FIND_PACKAGE(VTK REQUIRED PATHS ${VTK_ROOT_DIR} NO_DEFAULT_PATH)
-+  ENDIF()
-+  IF(NOT VTK_FOUND)
-+    FIND_PACKAGE(VTK REQUIRED)
-+  ENDIF()
-   INCLUDE(${VTK_USE_FILE})
-   MESSAGE(STATUS "  [ElmerGUI] VTK version:       " ${VTK_VERSION})
-   MESSAGE(STATUS "  [ElmerGUI] VTK_LIBS:          " "${VTK_LIBRARIES}")
diff --git a/elmerfem.desktop b/elmerfem.desktop
index 1eeea8df6f86..de526ad19265 100755
--- a/elmerfem.desktop
+++ b/elmerfem.desktop
@@ -1,9 +1,9 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Exec=ElmerGUIlogger
+Exec=ElmerGUI
 #MimeType=
-Comment=Simulation tool for CFD, FEM, electromagnetics, heat transfer and others featuring a PDE solver
+Comment=A finite element software for multiphysical problems
 Icon=/usr/share/pixmaps/elmerfem.png
 Terminal=false
 Name=ElmerGUI
diff --git a/elmerfem.sh b/elmerfem.sh
deleted file mode 100644
index 744ea59cb87a..000000000000
--- a/elmerfem.sh
+++ /dev/null
@@ -1 +0,0 @@
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/opt/vtk-qt4/lib"
\ No newline at end of file