commit: 2cc8e49653eb6e53ade87b69377f0d3f9652e678 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 14 21:21:36 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 14 22:52:22 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc8e496
dev-util/gource: Fix build w/ boost-1.89 Closes: https://bugs.gentoo.org/964602 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/gource/files/gource-0.55-boost-1.89.patch | 68 ++++++++++++++++++++++ dev-util/gource/gource-0.55.ebuild | 4 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dev-util/gource/files/gource-0.55-boost-1.89.patch b/dev-util/gource/files/gource-0.55-boost-1.89.patch new file mode 100644 index 000000000000..32bb6c45f281 --- /dev/null +++ b/dev-util/gource/files/gource-0.55-boost-1.89.patch @@ -0,0 +1,68 @@ +From 1b4e37d71506e6ad19f15190907852978507fc6a Mon Sep 17 00:00:00 2001 +From: Andrew Caudwell <[email protected]> +Date: Wed, 13 Aug 2025 13:56:09 +1200 +Subject: [PATCH] Fixed build with Boost 1.89.0 by no longer linking boost + system. + +Increased minimum required version of Boost to 1.69. + +Updated ax_boost_base.m4 macro +--- + configure.ac | 3 +- + m4/ax_boost_base.m4 | 8 +-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7220260b..4cbd354b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,8 +46,7 @@ AC_CHECK_FUNCS([IMG_LoadPNG_RW], , AC_MSG_ERROR([SDL2_image with PNG support req + AC_CHECK_FUNCS([IMG_LoadJPG_RW], , AC_MSG_ERROR([SDL2_image with JPEG support required. Please see INSTALL])) + + #BOOST +-AX_BOOST_BASE([1.46], , AC_MSG_ERROR(Boost Filesystem >= 1.46 is required. Please see INSTALL)) +-AX_BOOST_SYSTEM ++AX_BOOST_BASE([1.69], , AC_MSG_ERROR(Boost Filesystem >= 1.69 is required. Please see INSTALL)) + AX_BOOST_FILESYSTEM + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 +index 6c944b16..9d5a08c6 100644 +--- a/m4/ax_boost_base.m4 ++++ b/m4/ax_boost_base.m4 +@@ -10,7 +10,7 @@ + # + # Test for the Boost C++ libraries of a particular version (or newer) + # +-# If no path to the installed boost library is given the macro searchs ++# If no path to the installed boost library is given the macro searches + # under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates + # the $BOOST_ROOT environment variable. Further documentation is available + # at <http://randspringer.de/boost/index.html>. +@@ -33,7 +33,7 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 51 ++#serial 55 + + # example boost program (need to pass version) + m4_define([_AX_BOOST_BASE_PROGRAM], +@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ + AS_CASE([${host_cpu}], + [x86_64],[libsubdirs="lib64 libx32 lib lib64"], + [mips*64*],[libsubdirs="lib64 lib32 lib lib64"], +- [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"], ++ [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k|loongarch64],[libsubdirs="lib64 lib lib64"], + [libsubdirs="lib"] + ) + +@@ -289,6 +289,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ + else + AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) + fi ++ BOOST_LDFLAGS="" ++ BOOST_CPPFLAGS="" + # execute ACTION-IF-NOT-FOUND (if present): + ifelse([$3], , :, [$3]) + else diff --git a/dev-util/gource/gource-0.55.ebuild b/dev-util/gource/gource-0.55.ebuild index 92796cd7f2ff..44cb7c7f6c5e 100644 --- a/dev-util/gource/gource-0.55.ebuild +++ b/dev-util/gource/gource-0.55.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,8 @@ DEPEND="${COMMON_DEPEND} " BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-boost-1.89.patch" ) # bug 964602 + src_prepare() { default
