[med-svn] [Git][med-team/spdlog][master] 2 commits: Backport a patch from upstream to fix building with fmtlib 11.1

[Shengqi Chen (@harry)]

Shengqi Chen pushed to branch master at Debian Med / spdlog


Commits:
0bc494e4 by Shengqi Chen at 2025-01-10T17:46:10+08:00
Backport a patch from upstream to fix building with fmtlib 11.1

Signed-off-by: Shengqi Chen <harry-chen at outlook.com>

- - - - -
1a462d62 by Shengqi Chen at 2025-01-10T17:48:01+08:00
dch: finalize and upload 1.15.0+ds-2 to unstable

Signed-off-by: Shengqi Chen <harry-chen at outlook.com>

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix-fmtlib-11-1.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
+spdlog (1:1.15.0+ds-2) unstable; urgency=medium
+
+  * Team upload.
+  * Backport a patch from upstream to fix building with fmtlib 11.1.
+
+ -- Shengqi Chen <harry at debian.org>  Fri, 10 Jan 2025 17:46:13 +0800
+
 spdlog (1:1.15.0+ds-1) unstable; urgency=medium
 
   * Team upload.
   * Upload 1.15.0+ds-1 to unstable.
 
- -- Shengqi Chen <harry at debian.org>  Fri, 10 Jan 2025 14:36:13 +0800
+ -- Shengqi Chen <harry at debian.org>  Fri, 10 Jan 2025 17:45:50 +0800
 
 spdlog (1:1.15.0+ds-1~exp2) experimental; urgency=medium
 


=====================================
debian/patches/fix-fmtlib-11-1.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Backport upstream patch to fix compatiblity with fmtlib 11.1
+Author: Shengqi Chen <harry at debian.org>
+Bug: https://github.com/gabime/spdlog/pull/3301
+Bug: https://github.com/gabime/spdlog/pull/3314
+Forwarded: not-needed
+Applied-Upstream: refs/heads/v1.x
+Last-Update: 2025-01-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -364,12 +364,7 @@
+ }
+ #endif
+ 
+-#ifndef SPDLOG_USE_STD_FORMAT
+-template <typename T, typename... Args>
+-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+-    return fmt;
+-}
+-#elif __cpp_lib_format >= 202207L
++#if defined(SPDLOG_USE_STD_FORMAT) &&  __cpp_lib_format >= 202207L
+ template <typename T, typename... Args>
+ SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
+     std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 autopkgtest.patch
 use-external-fmt.patch
+fix-fmtlib-11-1.patch



View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/compare/38cdf46b93813a89bfdcc4f1fe35fcc1a3304f72...1a462d6221c44eeb4fd4bc1bf7582d13df051bdf

-- 
View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/compare/38cdf46b93813a89bfdcc4f1fe35fcc1a3304f72...1a462d6221c44eeb4fd4bc1bf7582d13df051bdf
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250110/36d6e646/attachment-0001.htm>