From da03fab4739b86242afdd2cd383410765ba5fa2d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 13 Jul 2021 12:41:31 +0000
Subject: [PATCH] community/opendht to 2.1.10-2

---
 community/opendht/PKGBUILD            | 12 +++++++++---
 community/opendht/opendht-gcc11.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 community/opendht/opendht-gcc11.patch

diff --git a/community/opendht/PKGBUILD b/community/opendht/PKGBUILD
index 664d4ca75..5007b1d93 100644
--- a/community/opendht/PKGBUILD
+++ b/community/opendht/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=opendht
 epoch=1
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="C++14 Distributed Hash Table (DHT) implementation"
 arch=(x86_64)
 url="https://github.com/savoirfairelinux/opendht"
@@ -16,8 +16,14 @@ license=(GPL3)
 depends=(openssl gnutls nettle argon2 readline fmt http-parser jsoncpp libjsoncpp.so)
 makedepends=(msgpack-c cmake cython python-setuptools cppunit restinio)
 optdepends=('python: to use the Python bindings')
-source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('917e5f691199349d6884a68c26645840914c18e72b2e21d97817618ddc55fb81')
+source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        opendht-gcc11.patch)
+sha256sums=('917e5f691199349d6884a68c26645840914c18e72b2e21d97817618ddc55fb81'
+            '4cd9ee51b3da01f00b0eb4367c48fb3a00df0840d5cf7beafaabcd149c8bd0fc')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < opendht-gcc11.patch # Fix build with GCC 11
+}
 
 build() {
   [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && echo "target_link_libraries(opendht PRIVATE atomic)" >> ${pkgname}-${pkgver}/CMakeLists.txt
diff --git a/community/opendht/opendht-gcc11.patch b/community/opendht/opendht-gcc11.patch
new file mode 100644
index 000000000..85d70ee13
--- /dev/null
+++ b/community/opendht/opendht-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/threadpooltester.cpp b/tests/threadpooltester.cpp
+index be948f9..4a5199f 100644
+--- a/tests/threadpooltester.cpp
++++ b/tests/threadpooltester.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include "opendht/thread_pool.h"
+ #include <atomic>
++#include <thread>
+ 
+ namespace test {
+ CPPUNIT_TEST_SUITE_REGISTRATION(ThreadPoolTester);