diff options
Diffstat (limited to 'app-admin/lnav')
-rw-r--r-- | app-admin/lnav/Manifest | 3 | ||||
-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 |
3 files changed, 41 insertions, 2 deletions
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index 6ae9643eb846..cdbb5adf82d5 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,6 +1,7 @@ AUX lnav-0.10.0-disable-remote-tests.patch 3986 BLAKE2B 62dcbb23d92a86caefdbd718d76a9c624d5d71249c60bb104dc0ce9db00c521fd99868e0ad7924d18a7895f437455a8af2ae36316d7d3271c08419b3b89012d3 SHA512 b956427959500ea80ca647c85530cd7a5c2db8368d5ed387e4c7153ba536d5840db0e627c17c911d51ce511f7db07377f51b868ae011cce2db55b0e1a4c99b98 AUX lnav-0.10.0-disable-tests.patch 915 BLAKE2B 5a96465a1870d670af76c28b46c31ce725e82d98da89ed3912d08c3051161dbd2d384234b3567fd605959d9a3fbd6960275b17474a1db5dfa0de1673dc53a273 SHA512 30d0a832ebe38db0c904d2032523ea904f4ea4636dace68c2a1e5d33029c14b97fe54cf3278d6db88fb89c61a49e3606eef96966b846c1a118e482495e8a5970 AUX lnav-0.10.0-use-system-doctest.patch 2167 BLAKE2B 6f573b41e49f2408bc2f63e998fca555145a5444af297e01540488943c761d1ab9fe025d0c2877b6f8f73ffe64ad37719670e3825f774df26b50a7bb5adac573 SHA512 70b9a139bb60d57ac5341c5d015072efab203f45c3ca9d81ea68fa413ba56bbed381c92c1bbd042591e825aefabc95eb5698b8fb5fbd74ea0bf564bd02cae64c +AUX lnav-0.10.1-gcc12.patch 1943 BLAKE2B f9cbee821b2f7b0ce6cf52353cc897fbe2a1aa4597ab9363b2030fca1f4b47f6115b117cbe6660df0bcec089f6d8f1eabe66e92ff218716822d44f076a012462 SHA512 cd7fd3f8df81a3e9fbf48bf9450c52980111bf0de35f701076661c1f3983b89c1145d47b2d17fea78ce4dd43e3fb0def411ab3dcac5a37865d4a9ebfff9b7e8a AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489 AUX lnav-0.9.0-bug639332-tinfow.patch 579 BLAKE2B 17707472f4fa764e27d98a1ae426f65a1ad45dacdc34e4c19b608298b7bbc094ddf3c49ded6987ac2c2f145dc58ff9f520a49c44551b277182b76ef13b2fc2fb SHA512 b69da2eac944affd7c70bdf9bcc2be333d5d67d1415e05ebbfd87bff85369ffbe61399b05440637941bdfa4d220ae1ba100342a9e028ee789f3c9f0f1e2dec2c AUX lnav-0.9.0-bug713600_0.patch 896 BLAKE2B 2fbd1d499a615051438bbeaf1a57ee6120f42bc8b99d4fe368f929a19bfcb6e745fe2a6942fe28d4085a9c939110865ec71dd62d52be50b9e1be5105d1f38b95 SHA512 433b60e379c582b25db5a321b91cbf332deb84430149b0a3d31e0cb8ce2c5cce0c6b01b35660e82550259768dcd42eb4758d21d5064739b8f4831029c77692b4 @@ -12,6 +13,6 @@ DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5e DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151 EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d EBUILD lnav-0.10.0-r2.ebuild 1869 BLAKE2B 258ea8166f16e92c9f5673b25beaa9d10d61a0e8189e8cacace55995879f7895162c8696d60ac50d241ebcde70955b883e9ee7bc7b62fa44efdd664e9f8b1037 SHA512 b3f853d1b5e9636760a9c754c88d0c50c722c41d4e4b043f45e0b14b2372c161a40397354cb845296d8591adb6a76d21b0801528e33b7ef9b3e000b58d2948d8 -EBUILD lnav-0.10.1.ebuild 1040 BLAKE2B 2fc8971942906fe18f93663584029bce552c1d64a3a2b7abf8b36249d7d5d99e6f8383e3b9681191d339179f45d86ea137ef7f0622da555bcb0ec7625594e0c0 SHA512 5431979c10f218a6e600baf98b9a68895431cb6f8d7769b289650d1c61b295424fe891860abd3b3e04832c48720a79c78cd0fd3268abfc7f7769f3ab31965d34 +EBUILD lnav-0.10.1.ebuild 1080 BLAKE2B 6bdac79cae613881d152a8a09431592006ba51e198e9c08f30eb7c8459c1c7977732efc51578d56db21f0defd29fb048d0283643ece4872f85597e47d69bbc97 SHA512 98c47a516f2b2ae42ded735b6294ad5eff3467f723fee36b907930846fe503680bfd6fbde8a5cb3e37b5626b2e4f3b4e04c57b8b775e4ba03fc5d99fb6e3c836 EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f 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() { |