Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
Date: Wed, 11 May 2022 01:04:15
Message-Id: 1652231040.cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.sam@gentoo
1 commit: cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae
2 Author: David Roman <davidroman96 <AT> gmail <DOT> com>
3 AuthorDate: Fri May 6 19:28:37 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed May 11 01:04:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5eb0f1
7
8 dev-libs/spdlog: fix clone async test
9
10 Closes: https://bugs.gentoo.org/840764
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/25355
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch | 13 +++++++++++++
17 dev-libs/spdlog/spdlog-1.9.2-r1.ebuild | 5 ++++-
18 2 files changed, 17 insertions(+), 1 deletion(-)
19
20 diff --git a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
21 new file mode 100644
22 index 000000000000..a224969d9025
23 --- /dev/null
24 +++ b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
25 @@ -0,0 +1,13 @@
26 +See https://bugs.gentoo.org/840764
27 +
28 +--- a/tests/test_misc.cpp
29 ++++ b/tests/test_misc.cpp
30 +@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
31 + logger->info("Some message 1");
32 + cloned->info("Some message 2");
33 +
34 +- spdlog::details::os::sleep_for_millis(10);
35 ++ spdlog::details::os::sleep_for_millis(100);
36 +
37 + REQUIRE(test_sink->lines().size() == 2);
38 + REQUIRE(test_sink->lines()[0] == "Some message 1");
39
40 diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
41 index c8f6d4c67329..d1522c98ebf1 100644
42 --- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
43 +++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
44 @@ -31,7 +31,10 @@ DEPEND="
45 "
46 RDEPEND="${DEPEND}"
47
48 -PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
49 +PATCHES=(
50 + "${FILESDIR}/${PN}-force_external_fmt.patch"
51 + "${FILESDIR}/${P}-fix-clone-test.patch"
52 +)
53
54 src_prepare() {
55 use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch