summaryrefslogtreecommitdiff
path: root/games/wesnoth
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-09-02 17:50:33 +0000
committernia <nia@pkgsrc.org>2019-09-02 17:50:33 +0000
commit9dd8569486d8eddf673a5f14ba4b3b59649883db (patch)
tree10b4589e44782673ee0b1fc034e171eb112ed743 /games/wesnoth
parentf046725654928672aeb05bcb414bf929e04a93d8 (diff)
downloadpkgsrc-9dd8569486d8eddf673a5f14ba4b3b59649883db.tar.gz
wesnoth: Fix build with Boost 1.70
Diffstat (limited to 'games/wesnoth')
-rw-r--r--games/wesnoth/distinfo3
-rw-r--r--games/wesnoth/patches/patch-src_server_server__base.cpp15
2 files changed, 17 insertions, 1 deletions
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 8cd615a933a..57c59d5039a 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2019/04/25 20:09:29 adam Exp $
+$NetBSD: distinfo,v 1.64 2019/09/02 17:50:33 nia Exp $
SHA1 (wesnoth-1.14.7.tar.bz2) = 057465f29c760c6dd42ef7b0d99c34e0e8f30c85
RMD160 (wesnoth-1.14.7.tar.bz2) = e5d72e299d9b29e2269add5184f04a5383783ac7
@@ -6,4 +6,5 @@ SHA512 (wesnoth-1.14.7.tar.bz2) = 0b30817a664ae0792e64392b864c4677eabb6ccbacf330
Size (wesnoth-1.14.7.tar.bz2) = 452705178 bytes
SHA1 (patch-CMakeLists.txt) = 5c580a7b9719d769507c2c0ec3580d6cf523e7f0
SHA1 (patch-src_CMakeLists.txt) = 5839663ab11a9fdc31e89b74ce2708a251155d9f
+SHA1 (patch-src_server_server__base.cpp) = 4114c52d8920d96c4e2babbde0491ab559f357a2
SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67
diff --git a/games/wesnoth/patches/patch-src_server_server__base.cpp b/games/wesnoth/patches/patch-src_server_server__base.cpp
new file mode 100644
index 00000000000..68d20bde13e
--- /dev/null
+++ b/games/wesnoth/patches/patch-src_server_server__base.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_server_server__base.cpp,v 1.1 2019/09/02 17:50:33 nia Exp $
+
+Remove redundant std::ref causing problems with Boost 1.70
+
+--- src/server/server_base.cpp.orig 2019-04-12 01:05:54.000000000 +0000
++++ 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));
+ }
+