Hello community,

here is the log from the commit of package spdlog for openSUSE:Factory checked 
in at 2019-12-11 12:00:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spdlog (Old)
 and      /work/SRC/openSUSE:Factory/.spdlog.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "spdlog"

Wed Dec 11 12:00:40 2019 rev:10 rq:754136 version:1.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/spdlog/spdlog.changes    2019-12-03 
12:40:20.918166582 +0100
+++ /work/SRC/openSUSE:Factory/.spdlog.new.4691/spdlog.changes  2019-12-11 
12:01:05.940841966 +0100
@@ -1,0 +2,5 @@
+Wed Dec  4 20:45:21 UTC 2019 - Luigi Baldoni <[email protected]>
+
+- Added spdlog-fmt_610.patch to fix build with fmt 6.1.0
+
+-------------------------------------------------------------------

New:
----
  spdlog-fmt_610.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ spdlog.spec ++++++
--- /var/tmp/diff_new_pack.YK1e5Z/_old  2019-12-11 12:01:06.744841628 +0100
+++ /var/tmp/diff_new_pack.YK1e5Z/_new  2019-12-11 12:01:06.744841628 +0100
@@ -25,6 +25,8 @@
 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 @@
 available at Github.
 
 %prep
-%autosetup
+%autosetup -p1
 find . -name '.gitignore' -exec rm {} \;
 sed -i -e "s,\r,," README.md LICENSE
 

++++++ spdlog-fmt_610.patch ++++++
>From 1aa9ea92e20142a1ce2f2e1ac40ed1fa781fac19 Mon Sep 17 00:00:00 2001
From: gabime <[email protected]>
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 {

Reply via email to