commit: a814e090a8c71531ebd92ee9c768ca09062b69ce Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Mon Dec 29 21:28:29 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 30 13:37:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a814e090
media-sound/guitarix: fix build w/ boost-1.89 Bug: https://bugs.gentoo.org/963539 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Part-of: https://github.com/gentoo/gentoo/pull/45198 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/guitarix-0.47.0-boost-1.89.patch | 40 ++++++++++++++++++++++ ...-0.47.0-r1.ebuild => guitarix-0.47.0-r2.ebuild} | 4 +++ 2 files changed, 44 insertions(+) diff --git a/media-sound/guitarix/files/guitarix-0.47.0-boost-1.89.patch b/media-sound/guitarix/files/guitarix-0.47.0-boost-1.89.patch new file mode 100644 index 000000000000..7cadce622402 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.47.0-boost-1.89.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/963539 +https://github.com/brummer10/guitarix/pull/240 +https://github.com/brummer10/guitarix/pull/245 + +--- a/wscript ++++ b/wscript +@@ -186,8 +186,13 @@ def check_boost(conf): + #include <boost/system/error_code.hpp> + int main() { boost::system::error_code c; } + """ +- msg = "Checking for boost-system " +- conf.check_cxx(msg = msg, fragment=code, lib="boost_system", uselib_store="BOOST_SYSTEM", mandatory=1,includes='/opt/local/include', libpath='/opt/local/lib') ++ msg = "Checking for boost-system" ++ # boost_system is a stub library since boost 1.69 and is completely removed in boost 1.89 ++ try: ++ conf.check_cxx(msg = msg, fragment=code, uselib_store="BOOST_SYSTEM", includes='/opt/local/include', libpath='/opt/local/lib') ++ except ConfigurationError: ++ conf.check_cxx(msg = msg, fragment=code, lib="boost_system", uselib_store="BOOST_SYSTEM", includes='/opt/local/include', libpath='/opt/local/lib') ++ #conf.check_cxx(msg = msg, fragment=code, lib="boost_system-mt", uselib_store="BOOST_SYSTEM", includes='/opt/local/include', libpath='/opt/local/lib') + # some boost (>1.49) versions depend on boost-system so we will check for it first + # and later link against boost_system were boost headers are included. + boost_atleast_version = 104200 +@@ -202,13 +207,11 @@ def check_boost(conf): + int main(){ return 0; } + """ % boost_atleast_version + msg = "Checking for boost >= %s" % boost_atleast_vermsg +- conf.check_cxx(msg = msg, fragment=code, lib="boost_system", mandatory=1) +- #conf.check_cxx(msg = msg, fragment=code, lib="boost_system-mt", mandatory=1,includes='/opt/local/include', libpath='/opt/local/lib') ++ conf.check_cxx(msg = msg, fragment=code, use='BOOST_SYSTEM', mandatory=1) ++ ++ msg = "Checking for boost_iostreams" ++ conf.check_cxx(msg = msg, fragment=code, lib=["boost_iostreams"], use='BOOST_SYSTEM', uselib_store="BOOST_IOSTREAMS", mandatory=1) + +- msg = "Checking for boost_iostreams >= %s" % boost_atleast_vermsg +- conf.check_cxx(msg = msg, fragment=code, lib=["boost_iostreams","boost_system"], uselib_store="BOOST_IOSTREAMS", mandatory=1) +- #conf.check_cxx(msg = msg, fragment=code, lib=["boost_iostreams","boost_system-mt"], uselib_store="BOOST_IOSTREAMS", mandatory=1, includes='/opt/local/include', libpath='/opt/local/lib') +- + #try: + # conf.check_cxx( + # msg = msg % "", fragment=code, lib="boost_thread", uselib_store="BOOST_THREAD", diff --git a/media-sound/guitarix/guitarix-0.47.0-r1.ebuild b/media-sound/guitarix/guitarix-0.47.0-r2.ebuild similarity index 97% rename from media-sound/guitarix/guitarix-0.47.0-r1.ebuild rename to media-sound/guitarix/guitarix-0.47.0-r2.ebuild index 178fbd42c462..4ea4d2f56d95 100644 --- a/media-sound/guitarix/guitarix-0.47.0-r1.ebuild +++ b/media-sound/guitarix/guitarix-0.47.0-r2.ebuild @@ -80,6 +80,10 @@ BDEPEND=" DOCS=( changelog README ) +PATCHES=( + "${FILESDIR}"/${P}-boost-1.89.patch +) + src_configure() { export -n {CXX,LD}FLAGS export STRIP="true"
