cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pokerth with newer boost

Browse Source 
Fix taken from archlinux. Tested by me with newer boost. Tested by Brad
with in-tree boost.
This commit is contained in:
daniel 2020-11-01 01:10:35 +00:00
parent 8bd420b796
commit e631697bc6
5 changed files with 105 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/pokerth/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.47 2020/03/20 16:44:23 naddy Exp $
# $OpenBSD: Makefile,v 1.48 2020/11/01 01:10:35 daniel Exp $
COMMENT= texas hold'em poker game with online capabilities
#'
BROKEN-hppa = needs atomic ops
DISTNAME = pokerth-1.1.2
REVISION = 5
REVISION = 6
CATEGORIES= games x11

31
games/pokerth/patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp,v 1.1 2020/11/01 01:10:35 daniel Exp $
Fix for newer boost; from archlinux
Index: src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig
+++ src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_
* needed.
*/
timer_ptr set_timer(long duration, timer_handler callback) {
- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
- lib::ref(*m_io_service),
- lib::asio::milliseconds(duration)
+ timer_ptr new_timer(
+ new lib::asio::steady_timer(
+ *m_io_service,
+ lib::asio::milliseconds(duration))
);
if (config::enable_multithreading) {
@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_
m_io_service = io_service;
if (config::enable_multithreading) {
- m_strand = lib::make_shared<lib::asio::io_service::strand>(
- lib::ref(*io_service));
+ m_strand.reset(new lib::asio::io_service::strand(*io_service));
}
lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,

38
games/pokerth/patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp,v 1.1 2020/11/01 01:10:35 daniel Exp $
Fix for newer boost; from archlinux
Index: src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig
+++ src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -191,8 +191,7 @@ class endpoint : public config::socket_type { (public)
m_io_service = ptr;
m_external_io_service = true;
- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
- lib::ref(*m_io_service));
+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
m_state = READY;
ec = lib::error_code();
@@ -660,9 +659,7 @@ class endpoint : public config::socket_type { (public)
* @since 0.3.0
*/
void start_perpetual() {
- m_work = lib::make_shared<lib::asio::io_service::work>(
- lib::ref(*m_io_service)
- );
+ m_work.reset(new lib::asio::io_service::work(*m_io_service));
}
/// Clears the endpoint's perpetual flag, allowing it to exit when empty
@@ -826,8 +823,7 @@ class endpoint : public config::socket_type { (public)
// Create a resolver
if (!m_resolver) {
- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
- lib::ref(*m_io_service));
+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
}
tcon->set_uri(u);

17
games/pokerth/patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp,v 1.1 2020/11/01 01:10:35 daniel Exp $
Fix for newer boost; from archlinux
Index: src/third_party/websocketpp/websocketpp/transport/asio/security/none.hpp
--- src/third_party/websocketpp/websocketpp/transport/asio/security/none.hpp.orig
+++ src/third_party/websocketpp/websocketpp/transport/asio/security/none.hpp
@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this
return socket::make_error_code(socket::error::invalid_state);
}
- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
- lib::ref(*service));
+ m_socket.reset(new lib::asio::ip::tcp::socket(*service));
m_state = READY;

17
games/pokerth/patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp,v 1.1 2020/11/01 01:10:35 daniel Exp $
Fix for newer boost; from archlinux
Index: src/third_party/websocketpp/websocketpp/transport/asio/security/tls.hpp
--- src/third_party/websocketpp/websocketpp/transport/asio/security/tls.hpp.orig
+++ src/third_party/websocketpp/websocketpp/transport/asio/security/tls.hpp
@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this
if (!m_context) {
return socket::make_error_code(socket::error::invalid_tls_context);
}
- m_socket = lib::make_shared<socket_type>(
- _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+ m_socket.reset(new socket_type(*service, *m_context));
m_io_service = service;
m_strand = strand;