From c06c6f5c6db63716a8ff658bd79d1badc060c59ebe6c8894d0e3a8ed95e1c200 Mon Sep 17 00:00:00 2001 From: Bernd Ritter Date: Fri, 12 Jan 2024 12:27:56 +0000 Subject: [PATCH 1/3] - Update spdlog to 1.13.0 - Removed patch 2823.patch because mismatch with new release - Release notes 1.13.0: * Qt Sink: Allow for darker colors for light backgrounds (#2817). Thanks to @krawq. * Set CMAKE_BUILD_TYPE only for single-config generators (#2839). Thanks to @moritz-h. * Provide spdlog_header_only in build directory export (#2846). Thanks to @robertmaynard. * Add SPDLOG_TO_VERSION to compare spdlog version (#2853). Thanks to @kegechen. * Support async_overflow_policy::discard_new (#2876). Thanks to @walkerlala. * Make syslog_sink.h's syslog_prio_from_level protected (#2918). Thanks to @shannonbooth. * Fix OS availability check of pthread_threadid_np for iOS (#2897). Thanks to @lowdesertpunk. * Add .git-blame-ignore-revs to ignore clang-format related commits (#2899). Thanks to @lowdesertpunk. * Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR (#2901). Thanks to @kkraus14. - Bugfixes: * Check fd_ is not nullptr in file_helper to prevent possible crash if disk is full (#2972). * Fix encoding issue in qt_sinks (#2862). Thanks to @neothenil and @tt4g . * Fix wrong thread_id (TID) in systemd_sink.h (#2919). Thanks to @M010. * Update example.cpp to fix the vector issue in bin_example (#2963). Thanks to @zhuzhzh. * Fix MSVC compile flag for no exceptions (#2974). Thanks to @Programicus. * Fix bug in circular_q::size() (#2820). * Fix link to fmt license file (#2967). - Maintenance: * Added and updated various tests for circular_q. * Removed obsolete part from CMake configuration files (#2871). Thanks to @albert-github. * Removed policy_max from cmake_minimum_required(..). * Updated clang-format to google style and updated various formatting scripts. * Bumped to catch2 v3.5.0. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=94 --- baselibs.conf | 2 +- spdlog.changes | 33 +++++++++++++++++++++++++++++++++ spdlog.spec | 10 +++++----- v1.12.0.tar.gz | 3 --- v1.13.0.tar.gz | 3 +++ 5 files changed, 42 insertions(+), 9 deletions(-) delete mode 100644 v1.12.0.tar.gz create mode 100644 v1.13.0.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 3f83a5a..0cf19f8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libspdlog1_12 +libspdlog1_13 diff --git a/spdlog.changes b/spdlog.changes index d95889a..c2b22c0 100644 --- a/spdlog.changes +++ b/spdlog.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jan 12 12:25:23 UTC 2024 - Bernd Ritter + +- Update spdlog to 1.13.0 +- Removed patch 2823.patch because mismatch with new release + +- Release notes 1.13.0: + * Qt Sink: Allow for darker colors for light backgrounds (#2817). Thanks to @krawq. + * Set CMAKE_BUILD_TYPE only for single-config generators (#2839). Thanks to @moritz-h. + * Provide spdlog_header_only in build directory export (#2846). Thanks to @robertmaynard. + * Add SPDLOG_TO_VERSION to compare spdlog version (#2853). Thanks to @kegechen. + * Support async_overflow_policy::discard_new (#2876). Thanks to @walkerlala. + * Make syslog_sink.h's syslog_prio_from_level protected (#2918). Thanks to @shannonbooth. + * Fix OS availability check of pthread_threadid_np for iOS (#2897). Thanks to @lowdesertpunk. + * Add .git-blame-ignore-revs to ignore clang-format related commits (#2899). Thanks to @lowdesertpunk. + * Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR (#2901). Thanks to @kkraus14. + +- Bugfixes: + * Check fd_ is not nullptr in file_helper to prevent possible crash if disk is full (#2972). + * Fix encoding issue in qt_sinks (#2862). Thanks to @neothenil and @tt4g . + * Fix wrong thread_id (TID) in systemd_sink.h (#2919). Thanks to @M010. + * Update example.cpp to fix the vector issue in bin_example (#2963). Thanks to @zhuzhzh. + * Fix MSVC compile flag for no exceptions (#2974). Thanks to @Programicus. + * Fix bug in circular_q::size() (#2820). + * Fix link to fmt license file (#2967). + +- Maintenance: + * Added and updated various tests for circular_q. + * Removed obsolete part from CMake configuration files (#2871). Thanks to @albert-github. + * Removed policy_max from cmake_minimum_required(..). + * Updated clang-format to google style and updated various formatting scripts. + * Bumped to catch2 v3.5.0. + ------------------------------------------------------------------- Sat Dec 30 16:58:29 UTC 2023 - Jan Engelhardt diff --git a/spdlog.spec b/spdlog.spec index 5e6dc0f..348cda0 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -1,7 +1,7 @@ # # spec file for package spdlog # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: spdlog -%define lname libspdlog1_12 -%define sover 1.12 -Version: 1.12.0 +%define lname libspdlog1_13 +%define sover 1.13 +Version: 1.13.0 Release: 0 Summary: C++ logging library License: MIT @@ -27,7 +27,7 @@ URL: https://github.com/gabime/spdlog Source0: https://github.com/gabime/%{name}/archive/refs/tags/v%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-UPSTREAM 2827.patch -- Added missing square bracket to fix the level_to_string_view -Patch0: https://patch-diff.githubusercontent.com/raw/gabime/spdlog/pull/2827.patch +#Patch0: https://patch-diff.githubusercontent.com/raw/gabime/spdlog/pull/2827.patch BuildRequires: cmake >= 3.10 %if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ >= 8 diff --git a/v1.12.0.tar.gz b/v1.12.0.tar.gz deleted file mode 100644 index 6392c4c..0000000 --- a/v1.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9 -size 251037 diff --git a/v1.13.0.tar.gz b/v1.13.0.tar.gz new file mode 100644 index 0000000..61c0077 --- /dev/null +++ b/v1.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9 +size 264003 From c025f2885467c48e45f2e64eb9c8cab3ab6faa88ee26d803be47f42878c82a3a Mon Sep 17 00:00:00 2001 From: Bernd Ritter Date: Fri, 12 Jan 2024 12:28:37 +0000 Subject: [PATCH 2/3] Removed patch file 2827.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=95 --- 2827.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 2827.patch diff --git a/2827.patch b/2827.patch deleted file mode 100644 index 17a68da..0000000 --- a/2827.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6a508d3d7e9af6e8b60eb00f77c2721ddf0e7ea1 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Sun, 23 Jul 2023 10:11:37 +0200 -Subject: [PATCH] Added missing square bracket to fix the level_to_string_view - test. - ---- - tests/test_misc.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp -index 9f3cb1744d..6199641ff2 100644 ---- a/tests/test_misc.cpp -+++ b/tests/test_misc.cpp -@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]") - REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello"); - } - --TEST_CASE("level_to_string_view", "[convert_to_string_view") -+TEST_CASE("level_to_string_view", "[convert_to_string_view]") - { - REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace"); - REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug"); From 0f5c26f806df3dc4cca9372c0c76cf6537717e77c240d7b044df11b8ed3e7401 Mon Sep 17 00:00:00 2001 From: Bernd Ritter Date: Mon, 15 Jan 2024 18:16:33 +0000 Subject: [PATCH 3/3] Accepting request 1138775 from home:dimstar:Factory 2823 != 2827 :) The file being deleted is called 2827.patch -Patch0: https://patch-diff.githubusercontent.com/raw/gabime/spdlog/pull/2827.patch - Removed patch 2827.patch because mismatch with new release OBS-URL: https://build.opensuse.org/request/show/1138775 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=96 --- spdlog.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spdlog.changes b/spdlog.changes index c2b22c0..83d1f35 100644 --- a/spdlog.changes +++ b/spdlog.changes @@ -2,7 +2,7 @@ Fri Jan 12 12:25:23 UTC 2024 - Bernd Ritter - Update spdlog to 1.13.0 -- Removed patch 2823.patch because mismatch with new release +- Removed patch 2827.patch because mismatch with new release - Release notes 1.13.0: * Qt Sink: Allow for darker colors for light backgrounds (#2817). Thanks to @krawq.