commit: 64b7cb1b2dc0d72fbd052704b7a03e64f3f4859f Author: Randy Barlow <randy <AT> electronsweatshop <DOT> com> AuthorDate: Tue Dec 13 02:46:36 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 14 00:12:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b7cb1b
app-admin/lnav: Drop 0.10.1 Signed-off-by: Randy Barlow <randy <AT> electronsweatshop.com> Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/lnav/Manifest | 1 - .../lnav/files/lnav-0.10.0-disable-tests.patch | 34 --------------- app-admin/lnav/files/lnav-0.10.1-gcc12.patch | 37 ---------------- app-admin/lnav/lnav-0.10.1.ebuild | 51 ---------------------- 4 files changed, 123 deletions(-) diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index 937500fc77bd..a5720cfe7f32 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,2 +1 @@ -DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5ef00d6a3fe750e4f5e7080ae29fde845f2c5055e2684aad1959368ff90abdc130130f8d6f0152426487e7396c SHA512 fff9632c1acbef80ba9d4214fd3ef485727792353fe493cfa4f2e9412bb371f50f2e1a735ded3d7bd8b16df5e93e03b0f3def296770e7dd0ad2206fd9f94690d DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97 diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch deleted file mode 100644 index c7a49d45f1d7..000000000000 --- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Certain tests commented out for stability reasons: -# listview: Fails when building inside sandbox -# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911 -# logfile: Flaky. Fails some times and not others. i.e. Race condition -# tui: Can hang the build ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -355,14 +355,14 @@ - test_cli.sh \ - test_cmds.sh \ - test_config.sh \ -- test_listview.sh \ -+ #test_listview.sh \ - test_meta.sh \ -- test_mvwattrline.sh \ -+ #test_mvwattrline.sh \ - test_grep_proc.sh \ - test_grep_proc2 \ - test_json_format.sh \ - test_log_accel \ -- test_logfile.sh \ -+ #test_logfile.sh \ - test_reltime \ - test_remote.sh \ - test_scripts.sh \ -@@ -376,7 +376,7 @@ - test_sql_str_func.sh \ - test_sql_time_func.sh \ - test_sql_xml_func.sh \ -- test_tui.sh \ -+ #test_tui.sh \ - test_data_parser.sh \ - test_pretty_print.sh \ - test_view_colors.sh \ diff --git a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch deleted file mode 100644 index 6ed4a73cebb2..000000000000 --- a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch +++ /dev/null @@ -1,37 +0,0 @@ -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+pschi...@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 deleted file mode 100644 index efa86cff1cf6..000000000000 --- a/app-admin/lnav/lnav-0.10.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A curses-based tool for viewing and analyzing log files" -HOMEPAGE="https://lnav.org"; -SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="unicode test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/bzip2:0= - app-arch/libarchive:= - >=dev-db/sqlite-3.9.0 - dev-libs/libpcre[cxx] - >=net-misc/curl-7.23.0 - sys-libs/ncurses:=[unicode(+)?] - sys-libs/readline:0= - sys-libs/zlib:0=" -DEPEND="${RDEPEND} - test? ( dev-cpp/doctest )" - -DOCS=( AUTHORS NEWS README ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch - "${FILESDIR}"/${PN}-0.10.1-gcc12.patch -) - -src_prepare() { - default - - eautoreconf - - # These tests use network and expect a running sshd, so we'll just delete them. - echo "#! /bin/bash" > test/test_remote.sh || die -} - -src_configure() { - econf \ - --disable-static \ - $(use_with test system-doctest) \ - $(use_with unicode ncursesw) -}
