diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
| commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
| tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /games-strategy/wesnoth | |
| parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) | |
gentoo resync : 02.08.2019
Diffstat (limited to 'games-strategy/wesnoth')
| -rw-r--r-- | games-strategy/wesnoth/Manifest | 3 | ||||
| -rw-r--r-- | games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch | 24 | ||||
| -rw-r--r-- | games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index ce1b5473ddd6..d0f7b724a36c 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,6 +1,7 @@ +AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b EBUILD wesnoth-1.14.6.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de -EBUILD wesnoth-1.14.7.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de +EBUILD wesnoth-1.14.7.ebuild 2731 BLAKE2B dbb292c86d40fe75acb4668ad1a4afa8794b338a59de45c7c44efc296ea9c7982d178f1e943629d9a4e14038ef19503a24b394956e25a6a079488fefafb4919f SHA512 104d6de80ffd977b0591999dc089e200242969ebbc15c373a4cde8d5209ace402969f174a928f8ac123ee9c2cfb5ecae426f19bb9e05760acf31dff5a9a5d0c4 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 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)); + } + diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild index 971ba1f87a94..e0b1b37602ec 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" |