From de8310392a551c4441efeddbbd49608a4cd19220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Aug 2022 17:00:45 +0700 Subject: [PATCH] supercollider: rebuild for boost-1.80 --- srcpkgs/supercollider/patches/boost.patch | 39 +++++++++++++++++++++++ srcpkgs/supercollider/template | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/supercollider/patches/boost.patch diff --git a/srcpkgs/supercollider/patches/boost.patch b/srcpkgs/supercollider/patches/boost.patch new file mode 100644 index 00000000000..db5c874dc46 --- /dev/null +++ b/srcpkgs/supercollider/patches/boost.patch @@ -0,0 +1,39 @@ +From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001 +From: brianlheim +Date: Tue, 25 Aug 2020 17:14:29 -0500 +Subject: [PATCH] remove workarounds for old boost versions + +we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use +--- + server/supernova/sc/sc_osc_handler.hpp | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp +index f17e99a5573..676c94dbf15 100644 +--- a/server/supernova/sc/sc_osc_handler.hpp ++++ b/server/supernova/sc/sc_osc_handler.hpp +@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer + class tcp_connection : public nova_endpoint { + public: + using pointer = std::shared_ptr; +-#if BOOST_VERSION >= 107000 +- using executor = boost::asio::executor; +-#else +- using executor = boost::asio::io_context::executor_type; +-#endif ++ using executor = tcp::socket::executor_type; + + static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); } + +@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer + bool operator==(tcp_connection const& rhs) const { return &rhs == this; } + + private: +-#if BOOST_VERSION >= 107000 + tcp_connection(const executor& executor): socket_(executor) {} +-#else +- tcp_connection(const executor& executor): socket_(executor.context()) {} +-#endif + + void send(const char* data, size_t length) override final; + diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 35f6d9dfb7c..b0b8278470e 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.11.1 -revision=3 +revision=4 wrksrc="SuperCollider-${version}-Source" build_style=cmake make_cmd=make