public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
Date: Wed, 11 May 2022 01:04:11 +0000 (UTC)	[thread overview]
Message-ID: <1652231040.cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.sam@gentoo> (raw)

commit:     cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri May  6 19:28:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 11 01:04:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5eb0f1

dev-libs/spdlog: fix clone async test

Closes: https://bugs.gentoo.org/840764
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25355
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch | 13 +++++++++++++
 dev-libs/spdlog/spdlog-1.9.2-r1.ebuild                  |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000000000000..a224969d9025
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
@@ -0,0 +1,13 @@
+See https://bugs.gentoo.org/840764
+
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
+     logger->info("Some message 1");
+     cloned->info("Some message 2");
+ 
+-    spdlog::details::os::sleep_for_millis(10);
++    spdlog::details::os::sleep_for_millis(100);
+ 
+     REQUIRE(test_sink->lines().size() == 2);
+     REQUIRE(test_sink->lines()[0] == "Some message 1");

diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
index c8f6d4c67329..d1522c98ebf1 100644
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${P}-fix-clone-test.patch"
+)
 
 src_prepare() {
 	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch


             reply	other threads:[~2022-05-11  1:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11  1:04 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-09-04 12:30 [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/ Sam James
2023-07-15  6:07 Sam James
2023-05-10 15:22 Sam James
2021-06-25  0:31 Sam James
2020-08-08  9:04 Joonas Niilola
2020-01-21  2:12 Craig Andrews
2019-07-21 12:02 Andreas Sturmlechner
2018-08-08 21:21 Craig Andrews
2018-06-12 17:38 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1652231040.cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox