diff options
| author |   Sam James <sam@gentoo.org> | 2024-07-24 08:11:50 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-07-24 08:11:50 +0100 |
| commit | 985c76dc6abde7bead4ac3eeef75c1e797c041bb (patch) | |
| tree | 020b1196312b9480da6a7d4045f9eb9ef6a84f7b /app-admin | |
| parent | app-admin/lnav: drop 0.11.1-r2 (diff) | |
| download | gentoo-985c76dc6abde7bead4ac3eeef75c1e797c041bb.tar.gz gentoo-985c76dc6abde7bead4ac3eeef75c1e797c041bb.tar.bz2 gentoo-985c76dc6abde7bead4ac3eeef75c1e797c041bb.zip | |
app-admin/lnav: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/936409
Thanks-to: David Seifert <soap@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/lnav/files/lnav-0.11.2-gcc15.patch | 23 | ||||
| -rw-r--r-- | app-admin/lnav/lnav-0.11.2.ebuild | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/app-admin/lnav/files/lnav-0.11.2-gcc15.patch b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch new file mode 100644 index 000000000000..0b9574dde24e --- /dev/null +++ b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch @@ -0,0 +1,23 @@ +https://github.com/tstack/lnav/pull/1285 +https://github.com/tstack/lnav/commit/ce97375280877f80e3dcebd20c21be44b13d8199 + +From ce97375280877f80e3dcebd20c21be44b13d8199 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sun, 21 Jul 2024 19:38:41 +0200 +Subject: [PATCH] [build] fix for GCC 15 two-phase lookup + +* GCC 15 is more aggressive about checking dependent names + +Bug: https://bugs.gentoo.org/936409 +--- a/src/vtab_module.hh ++++ b/src/vtab_module.hh +@@ -582,7 +582,7 @@ struct vtab_module : public vtab_module_base { + struct vtab { + explicit vtab(sqlite3* db, T& impl) : v_db(db), v_impl(impl) {} + +- explicit operator sqlite3_vtab*() { return &this->base; } ++ explicit operator sqlite3_vtab*() { return &this->v_base; } + + sqlite3_vtab v_base{}; + sqlite3* v_db; + diff --git a/app-admin/lnav/lnav-0.11.2.ebuild b/app-admin/lnav/lnav-0.11.2.ebuild index 1545017c774c..40c8357e90c0 100644 --- a/app-admin/lnav/lnav-0.11.2.ebuild +++ b/app-admin/lnav/lnav-0.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,7 @@ DOCS=( AUTHORS NEWS.md README ) PATCHES=( "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch + "${FILESDIR}"/${PN}-0.11.2-gcc15.patch ) src_prepare() { |