PETSc 3.19.0 compatibility

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79375d4e2f5c..fbcdf190d54a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = damask
 	license = AGPL3
 	makedepends = cmake
 	makedepends = python-setuptools
-	makedepends = petsc
+	makedepends = petsc<3.20
 	makedepends = hdf5-openmpi
 	makedepends = fftw
 	makedepends = zlib
@@ -18,7 +18,7 @@ pkgbase = damask
 	makedepends = python-h5py
 	makedepends = python-pyaml
 	optdepends = paraview: post-processing
-	source = https://damask3.mpie.de/download/damask-3.0.0-alpha7.tar.xz
+	source = https://damask.mpie.de/download/damask-3.0.0-alpha7.tar.xz
 	source = CMakeLists.patch
 	source = setup.patch
 	sha256sums = 442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4
@@ -32,7 +32,7 @@ pkgname = damask
 
 pkgname = damask-grid
 	pkgdesc = Grid solver for DAMASK
-	depends = petsc
+	depends = petsc<3.20
 	depends = hdf5-openmpi
 	depends = fftw
 	depends = zlib
@@ -41,7 +41,7 @@ pkgname = damask-grid
 
 pkgname = damask-mesh
 	pkgdesc = Mesh solver for DAMASK
-	depends = petsc
+	depends = petsc<3.20
 	depends = hdf5-openmpi
 	depends = libfyaml
 	optdepends = neper: pre-processing
diff --git a/PKGBUILD b/PKGBUILD
index 3df57fd2946f..4d521f90f7b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@ pkgbase=damask
 pkgname=('damask' 'damask-grid' 'damask-mesh' 'python-damask')
 pkgver=3.0.0~alpha7
 pkgver_=3.0.0-alpha7
-pkgrel=2
+pkgrel=3
 pkgdesc='DAMASK - The Duesseldorf Advanced Material Simulation Kit'
 arch=('x86_64')
 url='https://damask.mpie.de'
 license=('AGPL3')
 makedepends=('cmake' 'python-setuptools'
-             'petsc' 'hdf5-openmpi' 'fftw' 'zlib' 'libfyaml'
+             'petsc<3.20' 'hdf5-openmpi' 'fftw' 'zlib' 'libfyaml'
              'python-matplotlib' 'python-scipy' 'python-pandas' 'python-h5py' 'python-pyaml')
 optdepends=('paraview: post-processing')
-source=(https://damask3.mpie.de/download/damask-${pkgver_}.tar.xz
+source=(https://damask.mpie.de/download/damask-${pkgver_}.tar.xz
         CMakeLists.patch
         setup.patch)
 
@@ -21,7 +21,10 @@ sha256sums=('442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4'
             'c98b009ac98952528d3d50a0844d433b8635206df3e0525a8018ad68c6fad947')
 
 prepare() {
+    sed -i '24s/18/19/g' ${pkgname}-${pkgver_}/src/CLI.f90
+    sed -i '14s/19/20/g' ${pkgname}-${pkgver_}/CMakeLists.txt
     sed -i '73d;75d;77d' ${pkgname}-${pkgver_}/src/mesh/discretization_mesh.f90
+    sed -i '92i    DMAddField, &' ${pkgname}-${pkgver_}/src/mesh/mesh_mech_FEM.f90
     patch ${pkgname}-${pkgver_}/src/CMakeLists.txt "${srcdir}/CMakeLists.patch"
     patch ${pkgname}-${pkgver_}/python/setup.cfg "${srcdir}/setup.patch"
 }
@@ -39,7 +42,7 @@ build() {
 
 package_damask-grid() {
   pkgdesc='Grid solver for DAMASK'
-  depends=('petsc' 'hdf5-openmpi' 'fftw' 'zlib' 'libfyaml')
+  depends=('petsc<3.20' 'hdf5-openmpi' 'fftw' 'zlib' 'libfyaml')
   optdepends=('dream3d: pre-processing')
 
   install -Dm644 ${pkgbase}-${pkgver_}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
@@ -51,7 +54,7 @@ package_damask-grid() {
 
 package_damask-mesh() {
   pkgdesc='Mesh solver for DAMASK'
-  depends=('petsc' 'hdf5-openmpi' 'libfyaml')
+  depends=('petsc<3.20' 'hdf5-openmpi' 'libfyaml')
   optdepends=('neper: pre-processing')
 
   install -Dm644 ${pkgbase}-${pkgver_}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE