fix build

3 files changed, 38 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b03893455c7..a9b96dd420e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = getdp
 	pkgdesc = general environment for the Treatment of Discrete Problems
 	pkgver = 3.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://getdp.info/
 	arch = x86_64
 	license = LGPL3
@@ -16,9 +16,10 @@ pkgbase = getdp
 	makedepends = flex
 	makedepends = bison
 	makedepends = texinfo
+	makedepends = ninja
 	depends = python
 	depends = gmsh
-	source = http://getdp.info/src/getdp-3.5.0-source.tgz
-	sha256sums = 0bf76c49efa9b88401a457c12f7aabd97597ad49ef632d3fb9308aa8ea437bdc
+	source = git+https://gitlab.onelab.info/getdp/getdp.git#tag=getdp_3_5_0
+	sha256sums = SKIP
 
 pkgname = getdp
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b0b6250f8bd4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+src/
+pkg/
+getdp/
diff --git a/PKGBUILD b/PKGBUILD
index 6b24eb54f230..f5c90e25f7f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,47 @@
-# Contributor: Alexandr Parkhomenko <it@52tour.ru>
-# 33M    http://getdp.info/bin/Linux/getdp-3.3.0-Linux64c.tgz 
-# 2.7M   this
-
 pkgname=getdp
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='general environment for the Treatment of Discrete Problems'
 arch=('x86_64')
 url='http://getdp.info/'
 license=('LGPL3')
-depends=('python' 'gmsh')
-makedepends=('gcc' 'gcc-libs' 'cmake' 'git'
-             'arpack' 'openblas' 'lapack' 'swig'
-             'flex' 'bison' 'texinfo')
-# gcc-fortran Kernel PeWe SparskitZ
-# source=("$pkgname::git+https://gitlab.onelab.info/$pkgname/$pkgname")
-source=("http://$pkgname.info/src/$pkgname-$pkgver-source.tgz")
-sha256sums=('0bf76c49efa9b88401a457c12f7aabd97597ad49ef632d3fb9308aa8ea437bdc')
+depends=(
+python
+gmsh
+)
+makedepends=(
+gcc
+gcc-libs
+cmake
+git
+arpack
+openblas
+lapack
+swig
+flex
+bison
+texinfo
+ninja
+)
+
+_fragment="#tag=getdp_${pkgver//./_}"
+source=("git+https://gitlab.onelab.info/getdp/getdp.git${_fragment}")
+sha256sums=('SKIP')
 
 prepare() {
-  cd "${srcdir}/$pkgname-$pkgver-source"
-  sed -i '1i #include <cstring>' Kernel/Operation_Broadcast.cpp
+  cd getdp
+  #sed -i '1i #include <cstring>' Kernel/Operation_Broadcast.cpp
 }
 
-#pkgver() {
-#  cd "${srcdir}/$pkgname-$pkgver-source"
-#  ( set -o pipefail
-#    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-#    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-#  )
-#}
-
 build() {
-    cd "${startdir}"
-    if [ ! -d "build/$pkgname-$pkgver" ]; then
-        mkdir -p build/$pkgname-$pkgver;
-    fi
-    cd build/$pkgname-$pkgver
-    cmake "${srcdir}/$pkgname-$pkgver-source" \
-      -DCMAKE_INSTALL_PREFIX="/usr" 
-    make
+    cmake -B build_dir -S getdp -W no-dev -G Ninja \
+      -D CMAKE_BUILD_TYPE=None \
+      -D CMAKE_INSTALL_PREFIX='/usr'
+
+    cmake --build build_dir
 }
 
 package() {
-    cd "${startdir}/build/$pkgname-$pkgver"
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" cmake --install build_dir
 }