diff options
| author | Greg Hogan <code@greghogan.com> | 2024-01-17 17:03:58 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-02-05 22:54:51 +0100 |
| commit | 5618fd5d6f40b3a95d923ec344f72f32b557ae72 (patch) | |
| tree | 3a082e94f46c1778e388cb3ad1019bbef03a8d4d | |
| parent | 28434e496ca76f81f7bca4022912677209c300b7 (diff) | |
gnu: spdlog: Update to 1.13.0.
* gnu/packages/logging.scm (spdlog): Update to 1.13.0.
[source]: Remove upstreamed patch.
* gnu/local.mk: Unregister it.
* gnu/packages/patches/spdlog-fix-tests.patch: Delete file.
Change-Id: I78b5021b9841d16f43a283eaee931b4f92746ab8
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/logging.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/spdlog-fix-tests.patch | 26 |
3 files changed, 2 insertions, 30 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index fbdb2856957..6e294c7e0a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2045,7 +2045,6 @@ dist_patch_DATA = \ %D%/packages/patches/source-highlight-gcc-compat.patch \ %D%/packages/patches/softhsm-fix-openssl3-tests.patch \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ - %D%/packages/patches/spdlog-fix-tests.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \ %D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/steghide-fixes.patch \ diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 0efd828f8a4..47e8cd39c2c 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -213,7 +213,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.12.0") + (version "1.13.0") (source (origin (method git-fetch) @@ -221,9 +221,8 @@ output in multiple windows in a terminal.") (url "https://github.com/gabime/spdlog") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "spdlog-fix-tests.patch")) (sha256 - (base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k")))) + (base32 "0zgdmdgnp2y36jrlk85d4fiyjkjd6anly8pambyc3f3v6sg02zyy")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle diff --git a/gnu/packages/patches/spdlog-fix-tests.patch b/gnu/packages/patches/spdlog-fix-tests.patch deleted file mode 100644 index 13dffb309e4..00000000000 --- a/gnu/packages/patches/spdlog-fix-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Remove after next release and package update: -https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a - -From 2ee8bac78e6525a8ad9a9196e65d502ce390d83a Mon Sep 17 00:00:00 2001 -From: xvitaly <vitaly@easycoding.org> -Date: Sun, 23 Jul 2023 10:15:25 +0200 -Subject: [PATCH] Added missing square bracket to fix the level_to_string_view - test. (#2827) - ---- - 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 9f3cb1744..6199641ff 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"); |