From 99acca2a42bc9067cc69a317dd0da7e141322ba7ddb3ab2982fc8ff27998ae36 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 13 Jan 2020 20:23:04 +0000 Subject: [PATCH] Accepting request 764128 from home:alois:branches:devel:libraries:c_c++ Update to 1.5.0 OBS-URL: https://build.opensuse.org/request/show/764128 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=28 --- spdlog-1.4.2.tar.gz | 3 -- spdlog-1.5.0.tar.gz | 3 ++ spdlog-fmt_610.patch | 48 ---------------------------- spdlog.changes | 76 ++++++++++++++++++++++++++++++++++++++++++++ spdlog.spec | 12 ++----- 5 files changed, 82 insertions(+), 60 deletions(-) delete mode 100644 spdlog-1.4.2.tar.gz create mode 100644 spdlog-1.5.0.tar.gz delete mode 100644 spdlog-fmt_610.patch diff --git a/spdlog-1.4.2.tar.gz b/spdlog-1.4.2.tar.gz deleted file mode 100644 index 0cc42ee..0000000 --- a/spdlog-1.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:821c85b120ad15d87ca2bc44185fa9091409777c756029125a02f81354072157 -size 260262 diff --git a/spdlog-1.5.0.tar.gz b/spdlog-1.5.0.tar.gz new file mode 100644 index 0000000..d060f84 --- /dev/null +++ b/spdlog-1.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a +size 270416 diff --git a/spdlog-fmt_610.patch b/spdlog-fmt_610.patch deleted file mode 100644 index 0b45e6f..0000000 --- a/spdlog-fmt_610.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1aa9ea92e20142a1ce2f2e1ac40ed1fa781fac19 Mon Sep 17 00:00:00 2001 -From: gabime -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 -+#include - - 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 - - namespace spdlog { - namespace details { diff --git a/spdlog.changes b/spdlog.changes index 10d600b..0c4db11 100644 --- a/spdlog.changes +++ b/spdlog.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Mon Jan 13 19:58:43 UTC 2020 - Luigi Baldoni + +- Update to version 1.5.0 + New features: + * Added ringbuffer sink. Thanks @eudoxos (#1307). + * Auto create the required logging directories if they not + exist (9b7812a). + * Update bundled fmt to version 6.1.2. + * Addded the ! modifier to truncate the result if the field + size exceeds the specified width (see wiki for details) + Fixes and improvements: + * Fix build failure on clang 7 with libc++. Thanks @jktjkt + (a03f9eb). + * Fix some spelling errors. Thanks @flopp . + * Fix - compilation when using external fmt library. Thanks + @dvhwgumby for reporting (#1273). + * Fix location of CMake config info. Thanks @dvhwgumby for + reporting (#1274) + * Fix missing include (9a68bd8). + * CMake code duplication improvement. Thanks @bencsikandrei + (#1283) + * CMake improvments in tests . Thanks @Andrei-Florin BENCSIK + (2cc620e) + * Remove unused variable. Thanks @masmullin2000 (#1285) + * Fix tests to Use _FILE_OFFSET_BITS=64 when building on Linux + 32-bit systems. Thanks @yipdw (#1288). + * Improve systemd journald support. Thanks @jktjkt (#1292). + * Improve log macros. Thanks @pck (#1294). + * Removed lazy argument evaluation from macros (#163). + * Some micro optimizations (79468cf, 3ee4f28, bf40855). + * Correctly guard SetHandleInformation API call to better + support compiling for UWP. Thanks @sylveon (#1296). + * Exclude from compilation prevent_child_fd() if + SPDLOG_PREVENT_CHILD_FD not defined (57085c8) + * CMake - Added tweakme options to CMakeLists.txt (18edb8b). + * Removed SPDLOG_NO_DATETIME option. + * Fix meson tests build . Thanks vedranmiletic fore reporting + (#1295, c081919, 4a4f13b, 436ce16). + * Use #include" instead of spdlog/.* across the + codebase. Thanks @RedDwarf69 (#1304). + * Fix struct tm doesn't have tm_gmtoff in ISO C. Thanks + @lancesun (ff3e6c7, #1306) + * Always cache gmt offset (de2c07a). + * Optimize backtracer operator= (255f7f2). + * Fix some clang-tidy warnings (93008b2, bff8572, 3999613). + * Fix compiler error in os-inl.h min/max on Windows (#1302). + * Remove redundant semicolon. Thanks @inhzus (#1311). + * Fix compiler warnings. Thanks @0x8000-0000 (#1331). + * Fix missing include header in + `spdlog/sinks/daily_file_sink.h. Thanks @afoolsbag for + reporting (#1332). + * Fix elapsed time larger than 6 digits ignores alignment + width. Thanks @ivan236634452 for reporting (#1327). + * Set version for shared library in meson build. Thanks + @lgbaldoni (#1337). + * Improved dist_sink ctor. Thanks @mmakhalaf for reporting + (#1298). + * Fix #1325. Added SPDLOG_FMT_EXTERNAL_HO option. Thanks + @steffenb7333 for reporting. + * Fix #1340 (missing include). Thanks @jeanga for reporting. + * Fix compile on Win10 with Cygwin. Thanks @frfrankkopp and + @tt4g (#1347). + * Fixed #1348. Thanks @ficzerepeti for reporting. + * CMakeLists.txt allow overriding the cpp standard to higher + than 11 + * Fix a small problem in the basic example. Thanks @mike239x + (#1367). + * Fix invalid meson option. Thanks @segfault-magnet (#1370). + * meson: add fallback to fmt dependency #1378. Thanks @idanko + * Update docs: spdlog now available in conan center, + bincrafters repo is deprecated #1387. Thanks @gocarlos . + +- Dropped spdlog-fmt_610.patch (merged upstream) and + spdlog-external_fmt.patch (no longer necessary) + ------------------------------------------------------------------- Wed Dec 4 20:45:21 UTC 2019 - Luigi Baldoni diff --git a/spdlog.spec b/spdlog.spec index f5c4d9b..3e8e8c5 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -1,7 +1,7 @@ # # spec file for package spdlog # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,12 @@ %define _sover 1 Name: spdlog -Version: 1.4.2 +Version: 1.5.0 Release: 0 Summary: C++ logging library 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 @@ -46,7 +43,6 @@ logging library available at Github. %package devel Summary: Development files for %{name} -Group: Development/Languages/C and C++ Requires: lib%{name}%{_sover} = %{version} Requires: libstdc++-devel Requires: pkgconfig(fmt) @@ -57,7 +53,6 @@ applications that use %{name}. %package -n lib%{name}%{_sover} Summary: C++ logging library -Group: System/Libraries %description -n lib%{name}%{_sover} This is a packaged version of the gabime/spdlog C++ logging library @@ -97,8 +92,7 @@ export LD_LIBRARY_PATH="%{_builddir}/%{name}-%{version}/build" %doc README.md %{_includedir}/%{name} %{_libdir}/lib%{name}.so -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/cmake +%{_libdir}/cmake/%{name} %{_libdir}/pkgconfig/%{name}.pc %files -n lib%{name}%{_sover}