commit: 5bd1526cf0e8b971ebd3f5101f5f707bc6e33bf9 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Sun Jul 21 00:46:20 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 21 12:01:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd1526c
dev-libs/spdlog: fix patch of live ebuild Closes: https://bugs.gentoo.org/689788 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12486 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../spdlog/files/spdlog-9999-unbundle-fmt.patch | 45 ++++++++++++++++++++++ dev-libs/spdlog/spdlog-9999.ebuild | 4 +- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch new file mode 100644 index 00000000000..f6f37b5e493 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch @@ -0,0 +1,45 @@ +diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h +index 5d039b8c..8107b19a 100644 +--- a/include/spdlog/fmt/fmt.h ++++ b/include/spdlog/fmt/fmt.h +@@ -19,9 +19,6 @@ + #ifndef FMT_USE_WINDOWS_H + #define FMT_USE_WINDOWS_H 0 + #endif +-#include "bundled/core.h" +-#include "bundled/format.h" +-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib +-#include "fmt/core.h" +-#include "fmt/format.h" +-#endif ++#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib ++#include <fmt/core.h> ++#include <fmt/format.h> +diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h +index 9902898f..5e92a592 100644 +--- a/include/spdlog/fmt/ostr.h ++++ b/include/spdlog/fmt/ostr.h +@@ -11,8 +11,6 @@ + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif +-#include "bundled/ostream.h" +-#include "fmt.h" +-#else +-#include <fmt/ostream.h> + #endif ++ ++#include <fmt/ostream.h> +diff --git a/src/spdlog.cpp b/src/spdlog.cpp +index be91412d..d68dd522 100644 +--- a/src/spdlog.cpp ++++ b/src/spdlog.cpp +@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_ + // All rights reserved. + + #if !defined(SPDLOG_FMT_EXTERNAL) +-#include "spdlog/fmt/bundled/format-inl.h" ++#include <fmt/format-inl.h> + + FMT_BEGIN_NAMESPACE + template struct internal::basic_data<void>; diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild index 497e7da9b41..a9cbb03ae99 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-9999.ebuild @@ -25,13 +25,13 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" ) +PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" ) src_configure() { rm -r include/spdlog/fmt/bundled || die local mycmakeargs=( - -DSPDLOG_BUILD_EXAMPLES=no + -DSPDLOG_BUILD_EXAMPLE=no -DSPDLOG_BUILD_BENCH=no -DSPDLOG_BUILD_TESTS=$(usex test) )
