summaryrefslogtreecommitdiffstats
path: root/supercollider
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-07-17 14:54:58 +0000
committer Eric Hameleers <alien@slackware.com>2019-07-17 14:54:58 +0000
commit13f319fc64203c039aafc907d09cc900dfc6edb2 (patch)
tree7edbac1c24bf1dcb365f6574cc0f7044474f6d3b /supercollider
parentdc04a30aeda335d1187b3e1314b8e75855b5b6c5 (diff)
downloadasb-13f319fc64203c039aafc907d09cc900dfc6edb2.tar.gz
asb-13f319fc64203c039aafc907d09cc900dfc6edb2.tar.xz
Initial revision
Diffstat (limited to 'supercollider')
-rw-r--r--supercollider/build/patches/supercollder_boost_170.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/supercollider/build/patches/supercollder_boost_170.patch b/supercollider/build/patches/supercollder_boost_170.patch
new file mode 100644
index 00000000..a7ecf64a
--- /dev/null
+++ b/supercollider/build/patches/supercollder_boost_170.patch
@@ -0,0 +1,48 @@
+From d1c90150c3167bd89c1ef68a60815014736be01d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:30:38 +0200
+Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed)
+
+Fixes https://github.com/supercollider/supercollider/issues/4490
+---
+ server/supernova/sc/sc_osc_handler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
+index 25fff9fbd8..9886ba6b19 100644
+--- a/server/supernova/sc/sc_osc_handler.cpp
++++ b/server/supernova/sc/sc_osc_handler.cpp
+@@ -729,7 +729,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
+
+
+ void sc_osc_handler::start_tcp_accept(void) {
+- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
++ tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
+
+ tcp_acceptor_.async_accept(
+ new_connection->socket(),
+
+From ac06f3763bee50025299f5b1d2bd66aa3090eea6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:47:44 +0200
+Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp
+ include)
+
+See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html
+---
+ server/supernova/utilities/utils.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
+index 35b8ab5ada..a7c191f2db 100644
+--- a/server/supernova/utilities/utils.hpp
++++ b/server/supernova/utilities/utils.hpp
+@@ -23,6 +23,7 @@
+
+ #include <type_traits>
+
++#include <boost/checked_delete.hpp>
+ #include <boost/intrusive_ptr.hpp>
+ #include <boost/noncopyable.hpp>
+ #include <boost/detail/atomic_count.hpp>
+