[PATCH] fmt: Backport patch to fix spdlog ABI issue

[PATCH] fmt: Backport patch to fix spdlog ABI issue

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...01-Workaround-an-ABI-issue-in-spdlog.patch | 35 +++++++++++++++++++
 meta/recipes-devtools/fmt/fmt_11.1.4.bb       |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch

diff --git a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
new file mode 100644
index 00000000000..3fe85d51ee4
--- /dev/null
+++ b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
@@ -0,0 +1,35 @@
+From 5a5637c306c617ddb3726c76d3f7490a2dc0a5cd Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@meta.com>
+Date: Sat, 22 Mar 2025 06:57:04 -0700
+Subject: [PATCH] Workaround an ABI issue in spdlog
+
+Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/784eac839df77df1852dc1c50b17b76c3aec8f4a]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/fmt/format.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index 287e7163..61cb2825 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 };
+  * converted to `std::string` with `to_string(out)`.
+  */
+ template <typename T, size_t SIZE = inline_buffer_size,
+-          typename Allocator = detail::allocator<T>>
++          // DEPRECATED! std::allocator should be replaced with
++          // detail::allocator
++          typename Allocator = std::allocator<T>>
+ class basic_memory_buffer : public detail::buffer<T> {
+  private:
+   T store_[SIZE];
+@@ -2594,7 +2596,7 @@ class bigint {
+   }
+ 
+  public:
+-  FMT_CONSTEXPR bigint() : exp_(0) {}
++  FMT_CONSTEXPR20 bigint() : exp_(0) {}
+   explicit bigint(uint64_t n) { assign(n); }
+ 
+   bigint(const bigint&) = delete;
diff --git a/meta/recipes-devtools/fmt/fmt_11.1.4.bb b/meta/recipes-devtools/fmt/fmt_11.1.4.bb
index 7c860eb6087..1bcf758fd9a 100644
--- a/meta/recipes-devtools/fmt/fmt_11.1.4.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.1.4.bb
@@ -4,7 +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"
+SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \
+           file://0001-Workaround-an-ABI-issue-in-spdlog.patch"
 SRCREV = "123913715afeb8a437e6388b4473fcc4753e1c9a"
 
 S = "${WORKDIR}/git"

[PATCH] man-db: Do not delete chatset.alias

[Khem Raj]

charset.alias is not generated anymore

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/man-db/man-db_2.13.0.bb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta/recipes-extended/man-db/man-db_2.13.0.bb b/meta/recipes-extended/man-db/man-db_2.13.0.bb
index 750263f99ed..a0ce2150f9b 100644
--- a/meta/recipes-extended/man-db/man-db_2.13.0.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.0.bb
@@ -43,10 +43,6 @@ do_install() {
 	fi
 }
 
-do_install:append:libc-musl() {
-        rm -f ${D}${libdir}/charset.alias
-}
-
 FILES:${PN} += "${prefix}/lib/tmpfiles.d"
 
 FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so"

Patchtest results for [PATCH] fmt: Backport patch to fix spdlog ABI issue

[patchtest]

[-- Attachment #1: Type: text/plain, Size: 2908 bytes --]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/fmt-Backport-patch-to-fix-spdlog-ABI-issue.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!