diff options
| author | madpilot <madpilot@FreeBSD.org> | 2017-12-31 21:28:37 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 06:16:42 +0800 |
| commit | 778c081e96666086a77ed87f3aeb655a8b949150 (patch) | |
| tree | aa2b22fc684f2cc0a92ed54d5ee833670c5d63ab /games | |
| parent | 8a2e14e88d157b15d8b73110e3414db4e8e04902 (diff) | |
| download | freebsd-ports-gnome-778c081e96666086a77ed87f3aeb655a8b949150.tar.gz freebsd-ports-gnome-778c081e96666086a77ed87f3aeb655a8b949150.tar.zst freebsd-ports-gnome-778c081e96666086a77ed87f3aeb655a8b949150.zip | |
Add patches to fix pokerth build with upcoming boost 1.66.
This is a NOP with the current boost version.
PR: 224123
Submitted by: jbeich@
Obtained from: https://github.com/pokerth/pokerth/issues/338
Diffstat (limited to 'games')
| -rw-r--r-- | games/pokerth/files/patch-src_net_common_clientthread.cpp | 15 | ||||
| -rw-r--r-- | games/pokerth/files/patch-src_net_serveraccepthelper.h | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/games/pokerth/files/patch-src_net_common_clientthread.cpp b/games/pokerth/files/patch-src_net_common_clientthread.cpp new file mode 100644 index 000000000000..bd20f2612799 --- /dev/null +++ b/games/pokerth/files/patch-src_net_common_clientthread.cpp @@ -0,0 +1,15 @@ +--- src/net/common/clientthread.cpp.orig 2017-08-16 12:24:03 UTC ++++ src/net/common/clientthread.cpp +@@ -993,8 +993,12 @@ ClientThread::CreateContextSession() + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6())); + else + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4())); ++#if BOOST_VERSION < 106600 + boost::asio::socket_base::non_blocking_io command(true); + newSock->io_control(command); ++#else ++ newSock->non_blocking(true); ++#endif + newSock->set_option(tcp::no_delay(true)); + newSock->set_option(boost::asio::socket_base::keep_alive(true)); + diff --git a/games/pokerth/files/patch-src_net_serveraccepthelper.h b/games/pokerth/files/patch-src_net_serveraccepthelper.h new file mode 100644 index 000000000000..d3cd1795dbc1 --- /dev/null +++ b/games/pokerth/files/patch-src_net_serveraccepthelper.h @@ -0,0 +1,15 @@ +--- src/net/serveraccepthelper.h.orig 2017-08-16 12:24:03 UTC ++++ src/net/serveraccepthelper.h +@@ -122,8 +122,12 @@ class ServerAcceptHelper : public ServerAcceptInterfac + const boost::system::error_code &error) + { + if (!error) { ++#if BOOST_VERSION < 106600 + boost::asio::socket_base::non_blocking_io command(true); + acceptedSocket->io_control(command); ++#else ++ acceptedSocket->non_blocking(true); ++#endif + acceptedSocket->set_option(typename P::no_delay(true)); + acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); + boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); |