summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-07-26 20:21:23 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-07-26 20:23:30 +0200
commit428d22aca09a7b9fda1bab325ef24642d3e07448 (patch)
treee2c0f98c9965c1ce3b0c76f0140d724e7d60d685 /games-strategy/wesnoth/files
parentapp-backup/bacula: clean old 9.4.4 (diff)
downloadgentoo-428d22aca09a7b9fda1bab325ef24642d3e07448.tar.gz
gentoo-428d22aca09a7b9fda1bab325ef24642d3e07448.tar.bz2
gentoo-428d22aca09a7b9fda1bab325ef24642d3e07448.zip
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@gentoo.org>
Diffstat (limited to 'games-strategy/wesnoth/files')
-rw-r--r--games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch24
1 files changed, 24 insertions, 0 deletions
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 000000000000..90c526789c51
--- /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 <exodia339@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));
+ }
+