public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/
Date: Sat,  8 Aug 2020 09:04:34 +0000 (UTC)	[thread overview]
Message-ID: <1596877443.c680482145f31b0e20aae17bb9fbb2984e102aae.juippis@gentoo> (raw)

commit:     c680482145f31b0e20aae17bb9fbb2984e102aae
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 12 14:18:44 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 09:04:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6804821

dev-libs/spdlog: fix tests segfault

Closes: https://bugs.gentoo.org/731238
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16678
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 +++++++++++++
 dev-libs/spdlog/spdlog-1.6.1-r1.ebuild             |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
new file mode 100644
index 00000000000..8a6aa8020f7
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
+index e974cf51..5393dcac 100644
+--- a/include/spdlog/fmt/bin_to_hex.h
++++ b/include/spdlog/fmt/bin_to_hex.h
+@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>>
+     auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+     {
+         auto it = ctx.begin();
+-        while (*it && *it != '}')
++        while (it != ctx.end() && *it != '}')
+         {
+             switch (*it)
+             {

diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
index 04237834f6c..6d996c6f8ea 100644
--- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-libfmt-7.0.0.patch"
+	"${FILESDIR}/${P}-tests-fix.patch"
 )
 
 src_prepare() {


             reply	other threads:[~2020-08-08  9:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-08  9:04 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-12 14:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/ Sam James
2023-09-04 12:30 Sam James
2023-07-15  6:07 Sam James
2023-05-10 15:22 Sam James
2022-05-11  1:04 Sam James
2021-06-25  0:31 Sam James
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=1596877443.c680482145f31b0e20aae17bb9fbb2984e102aae.juippis@gentoo \
    --to=juippis@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