[med-svn] [salmon] 01/02: d/p/libspdlog: Correct sink class initialization, Closes: #884215

Gert Wollny gewo at moszumanska.debian.org
Wed Dec 13 10:19:52 UTC 2017


This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch version-7.2
in repository salmon.

commit b83ee55fbbe84f9c36b03d8588563d90308c6972
Author: Gert Wollny <gewo at debian.org>
Date:   Wed Dec 13 11:03:25 2017 +0100

    d/p/libspdlog: Correct sink class initialization, Closes: #884215
---
 debian/patches/libspdlog-14_0.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/libspdlog-14_0.patch b/debian/patches/libspdlog-14_0.patch
new file mode 100644
index 0000000..0617191
--- /dev/null
+++ b/debian/patches/libspdlog-14_0.patch
@@ -0,0 +1,15 @@
+Author: Gert Wollny <gewo at debian.org>
+Description: Correct instanziation of consoleSink for new spdlog version
+Debian-Bug: https://bugs.debian.org/884215
+--- a/src/SalmonUtils.cpp
++++ b/src/SalmonUtils.cpp
+@@ -1344,8 +1344,7 @@
+   auto fileSink = std::make_shared<spdlog::sinks::simple_file_sink_mt>(
+       logPath.string());
+   auto rawConsoleSink = std::make_shared<spdlog::sinks::stdout_sink_mt>();
+-  auto consoleSink =
+-      std::make_shared<spdlog::sinks::ansicolor_sink>(rawConsoleSink);
++  auto consoleSink = std::make_shared<spdlog::sinks::ansicolor_stdout_sink_mt>();
+   auto consoleLog = spdlog::create("stderrLog", {consoleSink});
+   auto fileLog = spdlog::create("fileLog", {fileSink});
+   auto jointLog = spdlog::create("jointLog", {fileSink, consoleSink});
diff --git a/debian/patches/series b/debian/patches/series
index fdd6bb4..7d1f5a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ use_debian_packaged_rapmap.patch
 add_MEM_F_SELF_OVLP.patch
 fix-unittest.patch
 reproducible.patch
+libspdlog-14_0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/salmon.git



More information about the debian-med-commit mailing list