Friday, October 30, 2020

Re: UPDATE: Boost 1.70

>
> games/pokerth
>
> In file included from ../src/net/common/chatcleanermanager.cpp:32:
> In file included from ../src/net/chatcleanermanager.h:36:
> In file included from /usr/local/include/boost/asio.hpp:24:
> In file included from /usr/local/include/boost/asio/basic_datagram_socket.hpp:20:
> In file included from /usr/local/include/boost/asio/basic_socket.hpp:27:
> In file included from /usr/local/include/boost/asio/executor.hpp:338:
> /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member named 'context' in 'std::__1::reference_wrapper<boost::asio::io_context>'
>
>

Think diff below might fix this one. Sourced from archlinux.

With this I was able to check that the game starts up.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.47
diff -u -p -u -r1.47 Makefile
--- Makefile 20 Mar 2020 16:44:23 -0000 1.47
+++ Makefile 31 Oct 2020 00:48:37 -0000
@@ -5,7 +5,7 @@ COMMENT= texas hold'em poker game with o
BROKEN-hppa = needs atomic ops

DISTNAME = pokerth-1.1.2
-REVISION = 5
+REVISION = 6

CATEGORIES= games x11

Index: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
===================================================================
RCS file: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
diff -N patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp 31 Oct 2020 00:48:37 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+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,
Index: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
===================================================================
RCS file: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
diff -N patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp 31 Oct 2020 00:48:37 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+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);
Index: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp
===================================================================
RCS file: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp
diff -N patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp 31 Oct 2020 00:48:37 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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;
+
Index: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp
===================================================================
RCS file: patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp
diff -N patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_tls_hpp 31 Oct 2020 00:48:37 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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;

No comments:

Post a Comment