commit: 428d22aca09a7b9fda1bab325ef24642d3e07448 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 26 18:21:23 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 26 18:23:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428d22ac
games-strategy/wesnoth: Fix build with boost-1.70 Closes: https://bugs.gentoo.org/690772 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch | 24 ++++++++++++++++++++++ games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 2 ++ 2 files changed, 26 insertions(+) diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch new file mode 100644 index 00000000000..90c526789c5 --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch @@ -0,0 +1,24 @@ +From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001 +From: Charles Dang <exodia...@gmail.com> +Date: Mon, 15 Jul 2019 03:18:31 +1100 +Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70 + (fixes #3990) + +The asio socket ctor already takes a reference. +--- + src/server/server_base.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp +index 82b46e912025..8bcf974a62d1 100644 +--- a/src/server/server_base.cpp ++++ b/src/server/server_base.cpp +@@ -65,7 +65,7 @@ void server_base::start_server() + + void server_base::serve() + { +- socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_)); ++ socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_); + acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket)); + } + diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild index 971ba1f87a9..e0b1b37602e 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild @@ -40,6 +40,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch ) + pkg_setup() { if use openmp; then tc-has-openmp || die "Please switch to an openmp compatible compiler"
