Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/
Date: Sat, 09 May 2020 20:08:14
Message-Id: 1589054843.d45feeaeec9e47c8d1feca7778a9cb30d0bac763.chewi@gentoo
1 commit: d45feeaeec9e47c8d1feca7778a9cb30d0bac763
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat May 9 17:49:36 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 20:07:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45feeae
7
8 games-strategy/wesnoth: remove unused patch
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/15731
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 .../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch | 24 ----------------------
16 1 file changed, 24 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 90c526789c5..00000000000
21 --- a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
22 +++ /dev/null
23 @@ -1,24 +0,0 @@
24 -From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
25 -From: Charles Dang <exodia339@×××××.com>
26 -Date: Mon, 15 Jul 2019 03:18:31 +1100
27 -Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
28 - (fixes #3990)
29 -
30 -The asio socket ctor already takes a reference.
31 ----
32 - src/server/server_base.cpp | 2 +-
33 - 1 file changed, 1 insertion(+), 1 deletion(-)
34 -
35 -diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
36 -index 82b46e912025..8bcf974a62d1 100644
37 ---- a/src/server/server_base.cpp
38 -+++ b/src/server/server_base.cpp
39 -@@ -65,7 +65,7 @@ void server_base::start_server()
40 -
41 - void server_base::serve()
42 - {
43 -- socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
44 -+ socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
45 - acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
46 - }
47 -