spdlog: fix build against newer fmt version

4 files changed, 78 insertions, 4 deletions

diff --git a/spdlog/.signature b/spdlog/.signature
index eea37b86e..d5c5a9966 100644
--- a/spdlog/.signature
+++ b/spdlog/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37fnrYPqz1XY9eNKbXb/KEwz9B1KjS6mcTYw63572DOzraANgxv/d5q+SyLKCcWD15BNi16yX+MhloxemuyAygs=
-SHA256 (Pkgfile) = fdff81c845d34f0f33457615c8e8943c0ae00bc2d38216cb831829ac858e24b8
+RWSagIOpLGJF35XGjcGozl/Ykl+dgeOsChgff2j6iyoZeYbdCrdPpv/RCCINt8GxHmlQQPyIClgQNWbQ1juUxISBPFClGxvxUwA=
+SHA256 (Pkgfile) = 2dc3ab887e55be6851e3aec5daa6d78dfccbe433acb8d7b9afd55185eabd82d2
 SHA256 (.footprint) = f1b75d26ee6052ecb4e68654f6c9d3a969043c6f9164ef897e28cc095e19744f
 SHA256 (spdlog-1.4.2.tar.gz) = 821c85b120ad15d87ca2bc44185fa9091409777c756029125a02f81354072157
+SHA256 (include-cassert.patch) = 54115d547f0caa9e25d1a467234aa51d3b50bc9cb7bd71f5f6cc50a82d2e2deb
diff --git a/spdlog/1340.patch b/spdlog/1340.patch
new file mode 100644
index 000000000..fe7a327be
--- /dev/null
+++ b/spdlog/1340.patch
@@ -0,0 +1,48 @@
+From 1aa9ea92e20142a1ce2f2e1ac40ed1fa781fac19 Mon Sep 17 00:00:00 2001
+From: gabime <gmelman1@gmail.com>
+Date: Tue, 3 Dec 2019 00:35:28 +0200
+Subject: [PATCH] Fix #1340
+
+---
+ include/spdlog/details/circular_q.h            | 1 +
+ include/spdlog/details/pattern_formatter-inl.h | 2 --
+ include/spdlog/details/thread_pool-inl.h       | 1 +
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h
+index 325dbfea..1f2712e7 100644
+--- a/include/spdlog/details/circular_q.h
++++ b/include/spdlog/details/circular_q.h
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {
+diff --git a/include/spdlog/details/pattern_formatter-inl.h b/include/spdlog/details/pattern_formatter-inl.h
+index cc2f7eaa..6fdc78a9 100644
+--- a/include/spdlog/details/pattern_formatter-inl.h
++++ b/include/spdlog/details/pattern_formatter-inl.h
+@@ -75,8 +75,6 @@ class scoped_padder
+ private:
+     void pad_it(long count)
+     {
+-        // count = std::min(count, spaces_.size());
+-        // assert(count <= spaces_.size());
+         fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast<size_t>(count)), dest_);
+     }
+ 
+diff --git a/include/spdlog/details/thread_pool-inl.h b/include/spdlog/details/thread_pool-inl.h
+index 29a6363f..43220f43 100644
+--- a/include/spdlog/details/thread_pool-inl.h
++++ b/include/spdlog/details/thread_pool-inl.h
+@@ -8,6 +8,7 @@
+ #endif
+ 
+ #include <spdlog/common.h>
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {
diff --git a/spdlog/Pkgfile b/spdlog/Pkgfile
index 50d34150b..c9e0d20d4 100644
--- a/spdlog/Pkgfile
+++ b/spdlog/Pkgfile
@@ -5,11 +5,14 @@
 
 name=spdlog
 version=1.4.2
-release=1
-source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz)
+release=2
+source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz
+  include-cassert.patch)
 
 build() {
   cd $name-$version
+  # https://github.com/gabime/spdlog/issues/1340
+  patch -Np1 -i $SRC/include-cassert.patch
   mkdir build
   cd build
   meson .. \
diff --git a/spdlog/include-cassert.patch b/spdlog/include-cassert.patch
new file mode 100644
index 000000000..5856393cd
--- /dev/null
+++ b/spdlog/include-cassert.patch
@@ -0,0 +1,22 @@
+diff -Naur spdlog-1.4.2.old/include/spdlog/details/circular_q.h spdlog-1.4.2/include/spdlog/details/circular_q.h
+--- spdlog-1.4.2.old/include/spdlog/details/circular_q.h	2019-12-20 21:31:05.407421825 +0100
++++ spdlog-1.4.2/include/spdlog/details/circular_q.h	2019-12-20 21:31:40.882235267 +0100
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {
+diff -Naur spdlog-1.4.2.old/include/spdlog/details/thread_pool-inl.h spdlog-1.4.2/include/spdlog/details/thread_pool-inl.h
+--- spdlog-1.4.2.old/include/spdlog/details/thread_pool-inl.h	2019-12-20 21:31:05.407421825 +0100
++++ spdlog-1.4.2/include/spdlog/details/thread_pool-inl.h	2019-12-20 21:32:15.390516965 +0100
+@@ -8,6 +8,7 @@
+ #endif
+ 
+ #include "spdlog/common.h"
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {