Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2019 14:53:29 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r496346 - in head: devel/RStudio/files devel/cpprestsdk/files devel/websocketpp devel/websocketpp/files games/wesnoth/files multimedia/musikcube/files
Message-ID:  <201903201453.x2KErTur037249@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Mar 20 14:53:29 2019
New Revision: 496346
URL: https://svnweb.freebsd.org/changeset/ports/496346

Log:
  devel/websocketpp: unbreak with boost 1.70
  
  PR:		236589

Added:
  head/devel/RStudio/files/patch-boost-1.70   (contents, props changed)
  head/devel/cpprestsdk/files/patch-z-boost-1.70   (contents, props changed)
  head/devel/websocketpp/files/
  head/devel/websocketpp/files/patch-boost-1.70   (contents, props changed)
  head/games/wesnoth/files/patch-boost-1.70   (contents, props changed)
  head/multimedia/musikcube/files/
  head/multimedia/musikcube/files/patch-boost-1.70   (contents, props changed)
Modified:
  head/devel/websocketpp/Makefile   (contents, props changed)

Added: head/devel/RStudio/files/patch-boost-1.70
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/RStudio/files/patch-boost-1.70	Wed Mar 20 14:53:29 2019	(r496346)
@@ -0,0 +1,62 @@
+https://github.com/zaphoyd/websocketpp/issues/794
+
+--- src/cpp/ext/websocketpp/transport/asio/connection.hpp.orig	2019-03-05 23:41:04 UTC
++++ src/cpp/ext/websocketpp/transport/asio/connection.hpp
+@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
+-            lib::ref(*m_io_service),
++            *m_io_service,
+             boost::posix_time::milliseconds(duration)
+         );
+ 
+@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
+ 
+         if (config::enable_multithreading) {
+             m_strand = lib::make_shared<boost::asio::io_service::strand>(
+-                lib::ref(*io_service));
++                *io_service);
+ 
+             m_async_read_handler = m_strand->wrap(lib::bind(
+                 &type::handle_async_read, get_shared(),lib::placeholders::_1,
+--- src/cpp/ext/websocketpp/transport/asio/endpoint.hpp.orig	2019-03-05 23:41:04 UTC
++++ src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
+@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
+         m_io_service = ptr;
+         m_external_io_service = true;
+         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
++            *m_io_service);
+ 
+         m_state = READY;
+         ec = lib::error_code();
+@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
+      */
+     void start_perpetual() {
+         m_work = lib::make_shared<boost::asio::io_service::work>(
+-            lib::ref(*m_io_service)
++            *m_io_service
+         );
+     }
+ 
+@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
+         // Create a resolver
+         if (!m_resolver) {
+             m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
+-                lib::ref(*m_io_service));
++                *m_io_service);
+         }
+ 
+         std::string proxy = tcon->get_proxy();
+--- src/cpp/ext/websocketpp/transport/asio/security/none.hpp.orig	2019-03-05 23:41:04 UTC
++++ src/cpp/ext/websocketpp/transport/asio/security/none.hpp
+@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
+         }
+ 
+         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++            *service);
+ 
+         m_state = READY;
+ 

Added: head/devel/cpprestsdk/files/patch-z-boost-1.70
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cpprestsdk/files/patch-z-boost-1.70	Wed Mar 20 14:53:29 2019	(r496346)
@@ -0,0 +1,62 @@
+https://github.com/zaphoyd/websocketpp/issues/794
+
+--- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig	2016-10-28 19:20:12 UTC
++++ libs/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
+-            lib::ref(*m_io_service),
++            *m_io_service,
+             boost::posix_time::milliseconds(duration)
+         );
+ 
+@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
+ 
+         if (config::enable_multithreading) {
+             m_strand = lib::make_shared<boost::asio::io_service::strand>(
+-                lib::ref(*io_service));
++                *io_service);
+ 
+             m_async_read_handler = m_strand->wrap(lib::bind(
+                 &type::handle_async_read, get_shared(),lib::placeholders::_1,
+--- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2016-10-28 19:20:12 UTC
++++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp
+@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
+         m_io_service = ptr;
+         m_external_io_service = true;
+         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
++            *m_io_service);
+ 
+         m_state = READY;
+         ec = lib::error_code();
+@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
+      */
+     void start_perpetual() {
+         m_work = lib::make_shared<boost::asio::io_service::work>(
+-            lib::ref(*m_io_service)
++            *m_io_service
+         );
+     }
+ 
+@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
+         // Create a resolver
+         if (!m_resolver) {
+             m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
+-                lib::ref(*m_io_service));
++                *m_io_service);
+         }
+ 
+         std::string proxy = tcon->get_proxy();
+--- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig	2016-10-28 19:20:12 UTC
++++ libs/websocketpp/websocketpp/transport/asio/security/none.hpp
+@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
+         }
+ 
+         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++            *service);
+ 
+         m_state = READY;
+ 

Modified: head/devel/websocketpp/Makefile
==============================================================================
--- head/devel/websocketpp/Makefile	Wed Mar 20 14:53:17 2019	(r496345)
+++ head/devel/websocketpp/Makefile	Wed Mar 20 14:53:29 2019	(r496346)
@@ -2,6 +2,7 @@
 
 PORTNAME=	websocketpp
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	arved@FreeBSD.org

Added: head/devel/websocketpp/files/patch-boost-1.70
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/websocketpp/files/patch-boost-1.70	Wed Mar 20 14:53:29 2019	(r496346)
@@ -0,0 +1,62 @@
+https://github.com/zaphoyd/websocketpp/issues/794
+
+--- websocketpp/transport/asio/connection.hpp.orig	2018-07-16 12:40:53 UTC
++++ websocketpp/transport/asio/connection.hpp
+@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
+      */
+     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),
++            *m_io_service,
+             lib::asio::milliseconds(duration)
+         );
+ 
+@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_
+ 
+         if (config::enable_multithreading) {
+             m_strand = lib::make_shared<lib::asio::io_service::strand>(
+-                lib::ref(*io_service));
++                *io_service);
+         }
+ 
+         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
+--- websocketpp/transport/asio/endpoint.hpp.orig	2018-07-16 12:40:53 UTC
++++ websocketpp/transport/asio/endpoint.hpp
+@@ -196,7 +196,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_io_service);
+ 
+         m_state = READY;
+         ec = lib::error_code();
+@@ -689,7 +689,7 @@ class endpoint : public config::socket_type { (public)
+      */
+     void start_perpetual() {
+         m_work = lib::make_shared<lib::asio::io_service::work>(
+-            lib::ref(*m_io_service)
++            *m_io_service
+         );
+     }
+ 
+@@ -855,7 +855,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_io_service);
+         }
+ 
+         tcon->set_uri(u);
+--- websocketpp/transport/asio/security/none.hpp.orig	2018-07-16 12:40:53 UTC
++++ websocketpp/transport/asio/security/none.hpp
+@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
+         }
+ 
+         m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++            *service);
+ 
+         if (m_socket_init_handler) {
+             m_socket_init_handler(m_hdl, *m_socket);

Added: head/games/wesnoth/files/patch-boost-1.70
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/wesnoth/files/patch-boost-1.70	Wed Mar 20 14:53:29 2019	(r496346)
@@ -0,0 +1,13 @@
+https://github.com/wesnoth/wesnoth/issues/3990
+
+--- src/server/server_base.cpp.orig	2018-09-16 07:27:00 UTC
++++ 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));
+ }
+ 

Added: head/multimedia/musikcube/files/patch-boost-1.70
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/musikcube/files/patch-boost-1.70	Wed Mar 20 14:53:29 2019	(r496346)
@@ -0,0 +1,62 @@
+https://github.com/zaphoyd/websocketpp/issues/794
+
+--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/connection.hpp.orig	2019-02-18 23:04:38 UTC
++++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/connection.hpp
+@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
+      */
+     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),
++            *m_io_service,
+             lib::asio::milliseconds(duration)
+         );
+ 
+@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_
+ 
+         if (config::enable_multithreading) {
+             m_strand = lib::make_shared<lib::asio::io_service::strand>(
+-                lib::ref(*io_service));
++                *io_service);
+         }
+ 
+         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
+--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp.orig	2019-02-18 23:04:38 UTC
++++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp
+@@ -192,7 +192,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_io_service);
+ 
+         m_state = READY;
+         ec = lib::error_code();
+@@ -661,7 +661,7 @@ class endpoint : public config::socket_type { (public)
+      */
+     void start_perpetual() {
+         m_work = lib::make_shared<lib::asio::io_service::work>(
+-            lib::ref(*m_io_service)
++            *m_io_service
+         );
+     }
+ 
+@@ -827,7 +827,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_io_service);
+         }
+ 
+         tcon->set_uri(u);
+--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/security/none.hpp.orig	2019-02-18 23:04:38 UTC
++++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/security/none.hpp
+@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
+         }
+ 
+         m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++            *service);
+ 
+         m_state = READY;
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903201453.x2KErTur037249>