commit: a420618dc766bba0654dbe0ef67008fdc5e901c6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 15:56:24 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 15:56:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a420618d
media-sound/supercollider: Fix USE server w/ boost-1.70, no ccache Closes: https://bugs.gentoo.org/689244 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/supercollider-3.10.2-boost-1.70.patch | 53 ++++++++++++++++++++++ .../files/supercollider-3.10.2-no-ccache.patch | 25 ++++++++++ .../supercollider/supercollider-3.10.2.ebuild | 2 + 3 files changed, 80 insertions(+) diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch new file mode 100644 index 00000000000..74fc05ac45c --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch @@ -0,0 +1,53 @@ +From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@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 5116a1be8..8c2418b09 100644 +--- a/server/supernova/sc/sc_osc_handler.cpp ++++ b/server/supernova/sc/sc_osc_handler.cpp +@@ -728,7 +728,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(), +-- +2.22.0 + +From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@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 35b8ab5ad..a7c191f2d 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> +-- +2.22.0 + diff --git a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch new file mode 100644 index 00000000000..66a765a8b9e --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch @@ -0,0 +1,25 @@ +disabled the use of ccache, to prevent FTBFS; as the compilation is done once +it has no backdraws to make the debian package. +Index: supercollider/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON + ############################################# + # Detect CCache + +-find_program(CCacheExectuable ccache) +-if( CCacheExectuable ) +- # only used with >=cmake-3.4 +- set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) +- set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) +-endif() ++## find_program(CCacheExecutable ccache) ++## if( CCacheExecutable ) ++## # only used with >=cmake-3.4 ++## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" ) ++## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" ) ++## endif() + + ############################################# + # Options diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild index 83ab1fcb862..6ea80528297 100644 --- a/media-sound/supercollider/supercollider-3.10.2.ebuild +++ b/media-sound/supercollider/supercollider-3.10.2.ebuild @@ -62,8 +62,10 @@ DEPEND="${RDEPEND} " PATCHES=( + "${FILESDIR}"/${P}-no-ccache.patch "${FILESDIR}"/${P}-system-boost.patch "${FILESDIR}"/${P}-boost-1.67.patch + "${FILESDIR}"/${P}-boost-1.70.patch ) S="${WORKDIR}/SuperCollider-Source"
