Date: Sat, 9 Nov 2024 13:11:01 GMT From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 26f212b0b220 - 2024Q4 - games/glob2: fix build with boost-1.85 Message-ID: <202411091311.4A9DB1Kd044709@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=26f212b0b220f96a2da7e5f3e2d32cb0c7ddbe9f commit 26f212b0b220f96a2da7e5f3e2d32cb0c7ddbe9f Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2024-11-09 13:10:26 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2024-11-09 13:10:26 +0000 games/glob2: fix build with boost-1.85 (cherry picked from commit e0a38371e522dbed3341bf8ff8732ae416c80b26) --- games/glob2/Makefile | 4 +--- games/glob2/files/patch-libusl_src_native.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/games/glob2/Makefile b/games/glob2/Makefile index d04d8d5071b3..840ef78acd48 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -1,6 +1,6 @@ PORTNAME= glob2 PORTVERSION= 0.9.5.0.g20240607 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= makc@FreeBSD.org @@ -10,8 +10,6 @@ WWW= https://globulation2.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.85 - LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libportaudio.so:audio/portaudio \ libspeex.so:audio/speex \ diff --git a/games/glob2/files/patch-libusl_src_native.h b/games/glob2/files/patch-libusl_src_native.h new file mode 100644 index 000000000000..af83767f6a65 --- /dev/null +++ b/games/glob2/files/patch-libusl_src_native.h @@ -0,0 +1,11 @@ +--- libusl/src/native.h.orig 2024-06-07 07:47:17 UTC ++++ libusl/src/native.h +@@ -42,7 +42,7 @@ struct NativeValuePrototype: Prototype (private) + template<typename Function> + void addMethod(const std::string& name, const boost::function<Function>& function) + { +- BOOST_MPL_ASSERT(( boost::is_same<This, typename boost::function<Function>::arg1_type> )); ++ BOOST_MPL_ASSERT(( boost::is_same<This, typename boost::function_traits<Function>::arg1_type> )); + NativeCode* native = new NativeFunction<Function>(name, function, true); + Prototype::addMethod(native); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411091311.4A9DB1Kd044709>