commit: ba1de468b175f5acc188d85efd67948f54379d31 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Mon Jan 20 14:01:41 2025 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Mon Jan 20 14:02:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba1de468
app-text/klogg: fix build with GCC 15 Add missing include and respect user CXXFLAGS. Closes: https://bugs.gentoo.org/901159 Closes: https://bugs.gentoo.org/945010 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> app-text/klogg/files/klogg-22.06.0.1289-gcc15.patch | 12 ++++++++++++ .../files/klogg-22.06.0.1289-respect-cxxflags.patch | 16 ++++++++++++++++ app-text/klogg/klogg-22.06.0.1289-r1.ebuild | 10 +++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app-text/klogg/files/klogg-22.06.0.1289-gcc15.patch b/app-text/klogg/files/klogg-22.06.0.1289-gcc15.patch new file mode 100644 index 000000000..2b61e6098 --- /dev/null +++ b/app-text/klogg/files/klogg-22.06.0.1289-gcc15.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/945010 +Add missing include. +--- a/maddy/bb6b5ce266bb630fda8e2296d64604959cd99c66/include/maddy/blockparser.h ++++ b/maddy/bb6b5ce266bb630fda8e2296d64604959cd99c66/include/maddy/blockparser.h +@@ -6,6 +6,7 @@ + + // ----------------------------------------------------------------------------- + ++#include <cstdint> + #include <functional> + #include <sstream> + #include <string> diff --git a/app-text/klogg/files/klogg-22.06.0.1289-respect-cxxflags.patch b/app-text/klogg/files/klogg-22.06.0.1289-respect-cxxflags.patch new file mode 100644 index 000000000..0a1a8ec00 --- /dev/null +++ b/app-text/klogg/files/klogg-22.06.0.1289-respect-cxxflags.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/901159 +Respect user CXXFLAGS. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -132,11 +132,6 @@ if(MSVC) + else() + ucm_add_flags(CXX "-fno-sized-deallocation -fno-omit-frame-pointer") + ucm_add_flags(C CXX "-mmmx -msse -msse2 -msse3 -mssse3 -mpopcnt") +- if(KLOGG_GENERIC_CPU) +- ucm_add_flags(C CXX "-march=x86-64 -mtune=generic") +- else() +- ucm_add_flags(C CXX "-march=native -mtune=generic") +- endif() + endif(MSVC) + + if(WIN32) diff --git a/app-text/klogg/klogg-22.06.0.1289-r1.ebuild b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild index 2e0f3cd10..736066210 100644 --- a/app-text/klogg/klogg-22.06.0.1289-r1.ebuild +++ b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit xdg cmake +inherit cmake xdg DESCRIPTION="A GUI application to browse and search through long and complex log files" HOMEPAGE="https://klogg.filimonov.dev"; @@ -44,6 +44,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-missing-include.patch" + "${FILESDIR}/${P}-respect-cxxflags.patch" ) src_unpack() { @@ -55,6 +56,9 @@ src_unpack() { src_prepare() { cmake_src_prepare + + cd "${WORKDIR}/cpm_cache" || die + eapply "${FILESDIR}/${P}-gcc15.patch" } src_configure() {
