Supress warnings and fix enumeration type

2 files changed, 19 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f40471cf5fb1..ac1ec00543ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = dolfinx
 	pkgdesc = Next generation FEniCS problem solving environment
 	pkgver = 0.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/FEniCS/dolfinx
 	arch = x86_64
 	license = LGPL3
-	checkdepends = openssh
 	checkdepends = catch2
 	makedepends = cmake
 	depends = boost
@@ -19,6 +18,10 @@ pkgbase = dolfinx
 	optdepends = scotch: for compute graph partition
 	optdepends = kahip: for compute graph partition in parallel
 	source = dolfinx-0.6.0.tar.gz::https://github.com/FEniCS/dolfinx/archive/v0.6.0.tar.gz
+	source = requires-fix.patch::https://github.com/FEniCS/dolfinx/pull/2513.patch
+	source = enum-fix.patch::https://github.com/FEniCS/dolfinx/pull/2646.patch
 	sha512sums = 6e4bbeca9045cdc558fa5cdfd23abe55bdb773b326381eaa25f843e70d9df39c5707bfdf5412ae1845fc680bbbc7cb641f9cf6e4eb2226a760ddaab8d04237bf
+	sha512sums = 00c52da9c6af1babc57160930ff00e200cbfbe27baaa13874fa13dadbadfc03d42540873693cb451a5af6a9bc7bdab6d239b25ca5c8eecb21c40ea9cd47502c4
+	sha512sums = 5c5ea77d17604b740419066f9342314461c9b48216b4021d6ee822338721859c2e9c5a4406fb489d03416567735f4238cc8900d592b87a13956c08010a35b856
 
 pkgname = dolfinx
diff --git a/PKGBUILD b/PKGBUILD
index 0142af343037..9d7b434715a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,29 @@
 pkgname=dolfinx
 pkgdesc="Next generation FEniCS problem solving environment"
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://github.com/FEniCS/${pkgname}"
 license=(LGPL3)
 makedepends=(cmake)
 depends=(boost python-fenics-ffcx hdf5-openmpi parmetis petsc pugixml)
-checkdepends=(openssh catch2)
+checkdepends=(catch2)
 optdepends=('adios2: for use ADIOS2 writer'
   'slepc: for use SLEPc eigen solver'
   'scotch: for compute graph partition'
   'kahip: for compute graph partition in parallel')
-source=(${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz)
-sha512sums=('6e4bbeca9045cdc558fa5cdfd23abe55bdb773b326381eaa25f843e70d9df39c5707bfdf5412ae1845fc680bbbc7cb641f9cf6e4eb2226a760ddaab8d04237bf')
+source=(${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz
+  requires-fix.patch::${url}/pull/2513.patch
+  enum-fix.patch::${url}/pull/2646.patch)
+sha512sums=('6e4bbeca9045cdc558fa5cdfd23abe55bdb773b326381eaa25f843e70d9df39c5707bfdf5412ae1845fc680bbbc7cb641f9cf6e4eb2226a760ddaab8d04237bf'
+  '00c52da9c6af1babc57160930ff00e200cbfbe27baaa13874fa13dadbadfc03d42540873693cb451a5af6a9bc7bdab6d239b25ca5c8eecb21c40ea9cd47502c4'
+  '5c5ea77d17604b740419066f9342314461c9b48216b4021d6ee822338721859c2e9c5a4406fb489d03416567735f4238cc8900d592b87a13956c08010a35b856')
+
+prepare() {
+  # https://github.com/FEniCS/dolfinx/issues/2645
+  patch -p1 -i ../requires-fix.patch
+  patch -p1 -i ../enum-fix.patch
+}
 
 build() {
   cmake \