summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-05-10 17:09:17 +0100
committerSam James <sam@gentoo.org>2023-05-10 17:09:26 +0100
commit71f385b11af6bcbf09f59a970c531771650d9c2f (patch)
tree2a89c8cab1a1a4e2683170964e44650f7bd04634 /dev-libs
parentprofiles: mask =dev-libs/libfmt-10.0.0 (diff)
downloadgentoo-71f385b11af6bcbf09f59a970c531771650d9c2f.tar.gz
gentoo-71f385b11af6bcbf09f59a970c531771650d9c2f.tar.bz2
gentoo-71f385b11af6bcbf09f59a970c531771650d9c2f.zip
Revert "dev-libs/spdlog: add patch metadata"
This reverts commit f6ca1358c59588198f05aa99b61fdac26dfad42b. Bug: https://bugs.gentoo.org/906069 Bug: https://bugs.gentoo.org/906071 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch14
1 files changed, 2 insertions, 12 deletions
diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
index 03ef4e591048..185fb12fb727 100644
--- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -3,18 +3,8 @@ Upstream: https://github.com/gabime/spdlog/pull/2694
Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
-https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
-
-From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
-From: H1X4 <10332146+H1X4Dev@users.noreply.github.com>
-Date: Fri, 31 Mar 2023 20:39:32 +0300
-Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
-
-* fix build for master fmt (non-bundled)
-
-* update fmt_runtime_string macro
-
-* fix build of updated macro
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a81..5f671c5c6 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;