From 6b00be11e3f713facd4fdc54b0a32d340871cdcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 30 Aug 2025 16:16:36 +0700 Subject: [PATCH] supercollider: for boost-1.89 --- srcpkgs/Field3D/template | 2 +- .../supercollider/patches/boost-1.89.patch | 38 +++++++++++++++++++ srcpkgs/supercollider/template | 2 +- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/supercollider/patches/boost-1.89.patch diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template index e23932b8d16..43746a23390 100644 --- a/srcpkgs/Field3D/template +++ b/srcpkgs/Field3D/template @@ -4,7 +4,7 @@ version=1.7.3 revision=12 build_style=cmake makedepends="boost-devel-minimal libboost_program_options libboost_thread - libboost_regex libboost_system hdf5-devel imath-devel libopenexr-devel" + libboost_regex hdf5-devel imath-devel libopenexr-devel" short_desc="Library for storing voxel data on disk and in memory" maintainer="Enno Boland " license="BSD-3-Clause" diff --git a/srcpkgs/supercollider/patches/boost-1.89.patch b/srcpkgs/supercollider/patches/boost-1.89.patch new file mode 100644 index 00000000000..02caa80b20a --- /dev/null +++ b/srcpkgs/supercollider/patches/boost-1.89.patch @@ -0,0 +1,38 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,7 +319,7 @@ if(SYSTEM_BOOST) + # Boost >= 1.71 ships with its own Boost config file, we ignore it for now. + set(Boost_NO_BOOST_CMAKE ON) + set(Boost_USE_MULTITHREADED ON) +- find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor ) ++ find_package( Boost 1.50.0 COMPONENTS thread filesystem program_options test_exec_monitor ) + if (Boost_FOUND) + # we're specifically setting up the boost libraries here, so we can + # name them +@@ -327,14 +327,12 @@ if(SYSTEM_BOOST) + set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION + ${Boost_THREAD_LIBRARY}) + add_library(boost_system_lib SHARED IMPORTED) +- set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION +- ${Boost_SYSTEM_LIBRARY}) ++ set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION -lc) + add_library(boost_program_options_lib SHARED IMPORTED) + set_property(TARGET boost_program_options_lib PROPERTY + IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY}) + add_library(boost_regex_lib SHARED IMPORTED) +- set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION +- ${Boost_REGEX_LIBRARY}) ++ set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION -lc) + add_library(boost_test_exec_monitor_lib SHARED IMPORTED) + set_property(TARGET boost_test_exec_monitor_lib PROPERTY + IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY}) +--- a/external_libraries/nova-tt/nova-tt/spin_lock.hpp ++++ b/external_libraries/nova-tt/nova-tt/spin_lock.hpp +@@ -24,6 +24,7 @@ + #include + + #include ++#include + + #include "pause.hpp" + diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index eecae33c565..37afefe7ee1 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.14.0 -revision=1 +revision=2 build_style=cmake make_cmd=make configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"