From: Wang Mingyu <wangmy@fujitsu.com>
Date: Tue, 18 Feb 2025 07:39:07 +0000 (+0800)
Subject: fmt: upgrade 11.1.1 -> 11.1.3
X-Git-Tag: yocto-5.2~466
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfe2d61fa142ae146abdb44a3de028b9804ddc91;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

fmt: upgrade 11.1.1 -> 11.1.3

fix-gcc9.patch
removed since it's included in 11.1.3

Changelog:
=========
- Fixed compilation on GCC 9.4
- Worked around an internal compiler error when using C++20 modules with GCC
  14.2 and earlier
- Worked around a bug in GCC 6
- Fixed an issue caused by instantiating 'formatter<const T>'
- Fixed formatting into 'std::ostreambuf_iterator' when using format string
  compilation
- Restored a constraint on the map formatter so that it correctly reports as
  unformattable when the element is
- Reduced the size of format specs
- Readded 'args()' to 'fmt::format_context'
- Fixed a bogus MSVC warning
- Fixed a pedantic mode error in the CMake config
- Fixed ABI compatibility with earlier 11.x versions
- Added 'wchar_t' support to the 'std::bitset' formatter
- Prefixed CMake components with 'fmt-' to simplify usage of {fmt} via
  'add_subdirectory'
- Updated docs for meson
- Fixed a compilation error in chrono on nvcc
- Fixed various warnings

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/fmt/files/fix-gcc9.patch b/meta/recipes-devtools/fmt/files/fix-gcc9.patch
deleted file mode 100644
index 1d67f7094de..00000000000
--- a/meta/recipes-devtools/fmt/files/fix-gcc9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5f0572acdca120e11f6d810765d7a6a3c593fcbb Mon Sep 17 00:00:00 2001
-From: Victor Zverovich <viz@meta.com>
-Date: Sat, 18 Jan 2025 09:00:22 -0800
-Subject: [PATCH] Workaround a compilation error on gcc 9.4
-
-Upstream-Status: Backport [5f0572acdca120e11f6d810765d7a6a3c593fcbb]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- include/fmt/format.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 9cd523a9e6a5..4466b4f4d24b 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -227,7 +227,9 @@ FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
- #if defined(FMT_USE_STRING_VIEW)
- template <typename Char> using std_string_view = std::basic_string_view<Char>;
- #else
--template <typename T> struct std_string_view {};
-+template <typename Char> struct std_string_view {
-+  operator basic_string_view<Char>() const;
-+};
- #endif
- 
- template <typename Char, Char... C> struct string_literal {
diff --git a/meta/recipes-devtools/fmt/fmt_11.1.1.bb b/meta/recipes-devtools/fmt/fmt_11.1.3.bb
similarity index 84%
rename from meta/recipes-devtools/fmt/fmt_11.1.1.bb
rename to meta/recipes-devtools/fmt/fmt_11.1.3.bb
index cfacd81a11a..9a2ee396dda 100644
--- a/meta/recipes-devtools/fmt/fmt_11.1.1.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.1.3.bb
@@ -4,9 +4,8 @@ HOMEPAGE = "https://fmt.dev"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
 
-SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \
-           file://fix-gcc9.patch"
-SRCREV = "e3ddede6c4ee818825c4e5a6dfa1d384860c27d9"
+SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
+SRCREV = "9cf9f38eded63e5e0fb95cd536ba51be601d7fa2"
 
 S = "${WORKDIR}/git"