diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2020-11-08 20:06:31 +0100 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2020-11-09 21:30:53 +0100 |
| commit | 908775ac57bb25bce3cc14b1058a49f81ff87b05 (patch) | |
| tree | 1f524b9b699efe7e70926cc2fb77459262fd9970 /dev-libs/spdlog | |
| parent | dev-python/nuitka: version bump to 0.6.9.6. (diff) | |
| download | gentoo-908775ac57bb25bce3cc14b1058a49f81ff87b05.tar.gz gentoo-908775ac57bb25bce3cc14b1058a49f81ff87b05.tar.bz2 gentoo-908775ac57bb25bce3cc14b1058a49f81ff87b05.zip | |
dev-libs/spdlog: remove unused patch(es).
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18193
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-libs/spdlog')
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch | 33 | ||||
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 |
2 files changed, 0 insertions, 46 deletions
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch deleted file mode 100644 index 422a507a6d86..000000000000 --- a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/gabime/spdlog/pull/1606 - -From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Mon, 6 Jul 2020 13:01:52 -0400 -Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail. - -See: https://github.com/fmtlib/fmt/issues/1538 ---- - include/spdlog/details/fmt_helper.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h -index cbc0bdf3..4f363858 100644 ---- a/include/spdlog/details/fmt_helper.h -+++ b/include/spdlog/details/fmt_helper.h -@@ -34,7 +34,15 @@ template<typename T> - inline unsigned int count_digits(T n) - { - using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type; -- return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n))); -+ return static_cast<unsigned int>(fmt:: -+// fmt 7.0.0 renamed the internal namespace to detail. -+// See: https://github.com/fmtlib/fmt/issues/1538 -+#if FMT_VERSION < 70000 -+internal -+#else -+detail -+#endif -+::count_digits(static_cast<count_type>(n))); - } - - inline void pad2(int n, memory_buf_t &dest) diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch deleted file mode 100644 index 8a6aa8020f7d..000000000000 --- a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h -index e974cf51..5393dcac 100644 ---- a/include/spdlog/fmt/bin_to_hex.h -+++ b/include/spdlog/fmt/bin_to_hex.h -@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>> - auto parse(ParseContext &ctx) -> decltype(ctx.begin()) - { - auto it = ctx.begin(); -- while (*it && *it != '}') -+ while (it != ctx.end() && *it != '}') - { - switch (*it) - { |