Accepting request 754135 from home:alois:branches:devel:libraries:c_c++

fix build with fmt 6.1.0

OBS-URL: https://build.opensuse.org/request/show/754135
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=26

spdlog-fmt_610.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(-)
+
+Index: spdlog-1.4.2/include/spdlog/details/circular_q.h
+===================================================================
+--- spdlog-1.4.2.orig/include/spdlog/details/circular_q.h
++++ spdlog-1.4.2/include/spdlog/details/circular_q.h
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {
+Index: spdlog-1.4.2/include/spdlog/details/pattern_formatter-inl.h
+===================================================================
+--- spdlog-1.4.2.orig/include/spdlog/details/pattern_formatter-inl.h
++++ spdlog-1.4.2/include/spdlog/details/pattern_formatter-inl.h
+@@ -72,8 +72,6 @@ public:
+ private:
+     void pad_it(size_t count)
+     {
+-        // count = std::min(count, spaces_.size());
+-        assert(count <= spaces_.size());
+         fmt_helper::append_string_view(string_view_t(spaces_.data(), count), dest_);
+     }
+ 
+Index: spdlog-1.4.2/include/spdlog/details/thread_pool-inl.h
+===================================================================
+--- spdlog-1.4.2.orig/include/spdlog/details/thread_pool-inl.h
++++ spdlog-1.4.2/include/spdlog/details/thread_pool-inl.h
+@@ -8,6 +8,7 @@
+ #endif
+ 
+ #include "spdlog/common.h"
++#include <cassert>
+ 
+ namespace spdlog {
+ namespace details {

spdlog.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec  4 20:45:21 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Added spdlog-fmt_610.patch to fix build with fmt 6.1.0
+
 -------------------------------------------------------------------
 Fri Nov 29 08:12:42 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
 

spdlog.spec

@@ -25,6 +25,8 @@ License:        MIT
 Group:          Development/Languages/C and C++
 URL:            https://github.com/gabime/spdlog
 Source0:        https://github.com/gabime/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM spdlog-fmt_610.patch
+Patch0:         spdlog-fmt_610.patch
 BuildRequires:  benchmark-devel >= 1.4.0
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -62,7 +64,7 @@ This is a packaged version of the gabime/spdlog C++ logging library
 available at Github.
 
 %prep
-%autosetup
+%autosetup -p1
 find . -name '.gitignore' -exec rm {} \;
 sed -i -e "s,\r,," README.md LICENSE