Uses system alglib, metis and voro++

2 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3419d78ff4f..cab3e882119d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gmsh
 	pkgdesc = An automatic 3D finite element mesh generator with pre and post-processing facilities.
 	pkgver = 4.5.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gmsh.info/
 	arch = x86_64
 	license = custom
@@ -9,12 +9,8 @@ pkgbase = gmsh
 	makedepends = desktop-file-utils
 	makedepends = sed
 	makedepends = swig
-	makedepends = fltk
-	makedepends = lapack
-	makedepends = med
-	makedepends = opencascade
-	makedepends = cairo
 	makedepends = texlive-core
+	makedepends = voro++
 	options = !emptydirs
 	source = http://gmsh.info/src/gmsh-4.5.6-source.tgz
 	source = gmsh.desktop
@@ -29,6 +25,8 @@ pkgname = gmsh
 	depends = med
 	depends = opencascade
 	depends = cairo
+	depends = metis
+	depends = alglib
 	optdepends = gmsh-docs: docs for gmsh
 	optdepends = python2: for onelab.py
 	optdepends = python: for onelab.py
diff --git a/PKGBUILD b/PKGBUILD
index d8edf4d68f53..831398202dbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,12 @@
 # Contributor: mickele <mimocciola@yahoo.com>
 pkgname=('gmsh' 'gmsh-docs')
 pkgver=4.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An automatic 3D finite element mesh generator with pre and post-processing facilities."
 arch=('x86_64')
 url="http://gmsh.info/"
 license=('custom')
-makedepends=('cmake' 'desktop-file-utils' 'sed' 'swig' 'fltk' 'lapack'
-             'med' 'opencascade' 'cairo' 'texlive-core')
+makedepends=('cmake' 'desktop-file-utils' 'sed' 'swig' 'texlive-core' 'voro++')
 options=(!emptydirs)
 source=("${url}src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion)
 sha256sums=('46eaeb0cdee5822fdaa4b15f92d8d160a8cc90c4565593cfa705de90df2a463f'
@@ -24,7 +23,11 @@ prepare() {
    sed -e "s|http://gmsh.info/|file:///usr/share/licenses/gmsh/|" \
        -i Fltk/helpWindow.cpp
    # remove root of build directory from installation
-   sed -i '/install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}\/api OPTIONAL)/d' CMakeLists.txt
+   sed -e '/install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}\/api OPTIONAL)/d' -i CMakeLists.txt
+   # fix alglib include
+   sed -e '770s_include_include/libalglib_' -i CMakeLists.txt
+   sed -e '919s_include_include/voro++_' -i CMakeLists.txt
+   #sed -e '955s_include_include/mmg/mmg3d_' -i CMakeLists.txt
 
 }
 
@@ -38,14 +41,15 @@ build() {
    cd build
 
    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_BUILD_SHARED=ON \
-      -DENABLE_PETSC=FALSE .. 
+      -DENABLE_SYSTEM_CONTRIB=ON  -DGMM_INC=0 -DMMG3D_INC=0 \
+      -DENABLE_PETSC=FALSE ..
 
    make
    LC_ALL=C make doc
 }
 
 package_gmsh() {
-   depends=('fltk' 'lapack' 'med' 'opencascade' 'cairo')
+   depends=('fltk' 'lapack' 'med' 'opencascade' 'cairo' 'metis' 'alglib')
    optdepends=('gmsh-docs: docs for gmsh'
             'python2: for onelab.py'
             'python: for onelab.py')