commit: 8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 24 18:21:53 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 24 18:22:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1a5167
dev-libs/libixion: Add new DEPEND, raise mdds minimum dep to 1.5.0 Closes: https://bugs.gentoo.org/680342 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libixion-9999-spdlog-non-bundled-fmt.patch | 25 ++++++++++++++++++++++ dev-libs/libixion/libixion-9999.ebuild | 10 ++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch new file mode 100644 index 00000000000..2cf5cb0a184 --- /dev/null +++ b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch @@ -0,0 +1,25 @@ +From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 24 Jul 2019 20:01:01 +0200 +Subject: [PATCH] Fix build when built against spdlog without bundled fmt + +--- + src/libixion/dirty_cell_tracker.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp +index 42d338b..7e6e3cc 100644 +--- a/src/libixion/dirty_cell_tracker.cpp ++++ b/src/libixion/dirty_cell_tracker.cpp +@@ -16,7 +16,7 @@ + #include <limits> + + #include <spdlog/spdlog.h> +-#include <spdlog/fmt/bundled/ostream.h> ++#include <spdlog/fmt/ostr.h> + + namespace ixion { + +-- +2.22.0 + diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild index 860c13488fc..92f685ee869 100644 --- a/dev-libs/libixion/libixion-9999.ebuild +++ b/dev-libs/libixion/libixion-9999.ebuild @@ -23,12 +23,16 @@ IUSE="debug python static-libs +threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +RDEPEND=" dev-libs/boost:= - >=dev-util/mdds-1.4.1:1= + >=dev-util/mdds-1.5.0:1= python? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/spdlog +" + +PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch ) pkg_setup() { use python && python-single-r1_pkg_setup
