diff options
| author |   Sam James <sam@gentoo.org> | 2022-04-21 19:32:50 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-21 19:49:33 +0100 |
| commit | 79715b2a19c283d1577f33322cc19f17d4b49861 (patch) | |
| tree | 2a41bb983b7e95c2301211cd2093debcfae99509 /app-admin | |
| parent | net-mail/mu: fix build with GCC 12 (diff) | |
| download | gentoo-79715b2a19c283d1577f33322cc19f17d4b49861.tar.gz gentoo-79715b2a19c283d1577f33322cc19f17d4b49861.tar.bz2 gentoo-79715b2a19c283d1577f33322cc19f17d4b49861.zip | |
app-admin/lnav: fix build with GCC 12
Closes: https://bugs.gentoo.org/839909
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/lnav/files/lnav-0.10.1-gcc12.patch | 37 | ||||
| -rw-r--r-- | app-admin/lnav/lnav-0.10.1.ebuild | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch new file mode 100644 index 000000000000..6ed4a73cebb2 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/839909 +https://github.com/tstack/lnav/pull/961 + +From b8a31ae9b4bcd5690a2b3d2fbd6373caffbc4a57 Mon Sep 17 00:00:00 2001 +From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com> +Date: Mon, 21 Feb 2022 21:09:30 +0100 +Subject: [PATCH] Add `#include <iterator>` to `string_util.cc` + +Lnav fails to build on the next Fedora version due to the following error: +``` +make[3]: Entering directory '/builddir/build/BUILD/lnav-0.10.1/src/base' +g++ -std=c++14 -DHAVE_CONFIG_H -I. -I../../src -Wall -I../../src/ -I../../src/third-party -I../../src/fmtlib -I../../src/third-party/doctest-root -I/usr/local/include -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o string_util.o string_util.cc +make[3]: Leaving directory '/builddir/build/BUILD/lnav-0.10.1/src/base' +string_util.cc: In function 'std::string repeat(const std::string&, size_t)': +string_util.cc:199:22: error: 'ostream_iterator' is not a member of 'std' + 199 | std::fill_n(std::ostream_iterator<std::string>(os), num, input); + | ^~~~~~~~~~~~~~~~ +string_util.cc:38:1: note: 'std::ostream_iterator' is defined in header '<iterator>'; did you forget to '#include <iterator>'? + 37 | #include "string_util.hh" + +++ |+#include <iterator> + 38 | +``` + +Reason is probably the updated GNU toolchain, more info: +https://fedoraproject.org/wiki/Changes/GNUToolchainF36 + +This patch fixes the issue. +--- a/src/base/string_util.cc ++++ b/src/base/string_util.cc +@@ -29,6 +29,7 @@ + + #include "config.h" + ++#include <iterator> + #include <regex> + #include <sstream> + diff --git a/app-admin/lnav/lnav-0.10.1.ebuild b/app-admin/lnav/lnav-0.10.1.ebuild index 1bad5c8f41d2..efa86cff1cf6 100644 --- a/app-admin/lnav/lnav-0.10.1.ebuild +++ b/app-admin/lnav/lnav-0.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,6 +31,7 @@ DOCS=( AUTHORS NEWS README ) PATCHES=( "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch + "${FILESDIR}"/${PN}-0.10.1-gcc12.patch ) src_prepare() { |