-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c3b6fdd
commit 8a7ba96
Showing
3 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,16 @@ | ||
fmtlib (10.1.1+ds1-4) unstable; urgency=medium | ||
|
||
* Backport patch to fix handling FMT_STATIC_THOUSANDS_SEPARATOR | ||
(Closes: #1086722) | ||
|
||
-- Shengjing Zhu <[email protected]> Tue, 05 Nov 2024 02:46:03 +0800 | ||
|
||
fmtlib (10.1.1+ds1-3) unstable; urgency=medium | ||
|
||
* Upload to unstable (Closes: #1072674) | ||
|
||
-- Shengjing Zhu <[email protected]> Mon, 04 Nov 2024 17:39:56 +0800 | ||
|
||
fmtlib (10.1.1+ds1-2) experimental; urgency=medium | ||
|
||
* Fix build with Sphinx 7 (Closes: #1042588) | ||
|
34 changes: 34 additions & 0 deletions
34
debian/patches/0007-Fix-handling-of-static-separator.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From: Victor Zverovich <[email protected]> | ||
Date: Fri, 9 Feb 2024 15:58:56 -0800 | ||
Subject: Fix handling of static separator | ||
|
||
Origin: backport, https://github.com/fmtlib/fmt/commit/44c3fe1e | ||
--- | ||
include/fmt/format-inl.h | 7 +++++-- | ||
1 file changed, 5 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h | ||
index dac2d43..21772c1 100644 | ||
--- a/include/fmt/format-inl.h | ||
+++ b/include/fmt/format-inl.h | ||
@@ -114,7 +114,11 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) { | ||
|
||
FMT_FUNC auto write_loc(appender out, loc_value value, | ||
const format_specs<>& specs, locale_ref loc) -> bool { | ||
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR | ||
+#ifdef FMT_STATIC_THOUSANDS_SEPARATOR | ||
+ value.visit(loc_writer<>{ | ||
+ out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."}); | ||
+ return true; | ||
+#else | ||
auto locale = loc.get<std::locale>(); | ||
// We cannot use the num_put<char> facet because it may produce output in | ||
// a wrong encoding. | ||
@@ -123,7 +127,6 @@ FMT_FUNC auto write_loc(appender out, loc_value value, | ||
return std::use_facet<facet>(locale).put(out, value, specs); | ||
return facet(locale).put(out, value, specs); | ||
#endif | ||
- return false; | ||
} | ||
} // namespace detail | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters