From 63d5afd4899b709c37a8f706bc62ae39a7dd7df7 Mon Sep 17 00:00:00 2001 From: npil Date: Thu, 16 Oct 2025 20:00:48 +0100 Subject: [PATCH] Dependency refinements Use system qscintilla Remove some unneeded dependencies Devendor boost --- .SRCINFO | 53 ++++++++++++++++++++++------------------------------- PKGBUILD | 29 +++++++++++++---------------- 2 files changed, 35 insertions(+), 47 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c5bb921bcf4b..e8a0969faa8f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = sonic-pi pkgdesc = The Live Coding Music Synth for Everyone pkgver = 4.6.0 - pkgrel = 1 + pkgrel = 2 url = https://sonic-pi.net/ arch = x86_64 groups = pro-audio @@ -17,48 +17,39 @@ pkgbase = sonic-pi license = BSD-3-Clause license = custom:ISC checkdepends = ruby-rake - makedepends = base-devel - makedepends = chrpath - makedepends = cmake - makedepends = erlang-headless - makedepends = gendesk + makedepends = boost>=1.74.0 + makedepends = erlang-asn1 + makedepends = erlang-public_key + makedepends = erlang-ssl + makedepends = erlang-parsetools + makedepends = erlang-sasl + makedepends = elixir makedepends = git - makedepends = licenses - makedepends = lua - makedepends = m4 - makedepends = ninja + makedepends = cmake + makedepends = gendesk + makedepends = chrpath + makedepends = qt6-base makedepends = qt6-tools - makedepends = ruby-bundler - depends = boost>=1.74.0 - depends = alsa-lib + makedepends = ruby-prime + makedepends = ruby-erb + makedepends = ruby-rexml depends = aubio - depends = elixir - depends = erlang - depends = erlang-xmerl - depends = libpng - depends = libx11 - depends = libxkbcommon - depends = openssl - depends = pipewire-jack + depends = ruby + depends = ruby-racc + depends = supercollider + depends = qscintilla-qt6 depends = qt6-base depends = qt6-svg depends = qt6-wayland - depends = qscintilla-qt6 - depends = rtmidi - depends = ruby - depends = ruby-erb - depends = ruby-prime - depends = ruby-racc - depends = ruby-rexml - depends = sc3-plugins - depends = supercollider - depends = wayland + depends = which optdepends = sox: for further effects source = sonic-pi-4.6.0.tar.gz::https://github.com/sonic-pi-net/sonic-pi/archive/refs/tags/v4.6.0.tar.gz source = sonic-pi-4.6.0-gui_paths.patch source = sonic-pi-4.6.0-ruby_paths.patch + source = sonic-pi-4.6.0-devendor_boost.patch sha512sums = d99d25bbb2e8b556156252140484502ce5bf2869f846b7aff69dae549812d18769b8cd6d9c474be36819d7a831b170553690906d89ece74cd9df2f80289d5892 sha512sums = 625b08cd7b1bbe93f898e36183badafed5e056b18df8d923b2ddb964fe358060501fcf63b9c8a05b95a5d9ab8d6dfb0419a7ed519b511c8e1612a7698df3f44a sha512sums = fa091666d493f302b507a8c8ccaf1992ee64214ec0f45b92198f724fce2b1cee718204afeba4de5ab6d2849a1e9a1933b623054fc459227a15529146d9937d7e + sha512sums = 841265559a7551d87750dffb4e224da4fdfd0657627ea8c7e61a996c2c854ee5773525b66cb1d750a5193e65f7e5f13cc5729f95d1d3d86b01d7a1a8be97226c pkgname = sonic-pi diff --git a/PKGBUILD b/PKGBUILD index 47ac242e0138..87807e733eec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,22 +1,23 @@ # Maintainer: Nathan Pilkington +# Contributor: David Runge pkgname=sonic-pi pkgver=4.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Live Coding Music Synth for Everyone" arch=(x86_64) url="https://sonic-pi.net/" license=(CC-BY-SA-4.0 LGPL-2.1-only GPL-2.0-only GPL-3.0-only MIT CC0-1.0 BSL-1.0 Ruby Apache-2.0 BSD-3-Clause custom:ISC) groups=(pro-audio) depends=( - 'boost>=1.74.0' # match vendored version - alsa-lib aubio elixir erlang erlang-xmerl libpng libx11 libxkbcommon - openssl pipewire-jack qt6-base qt6-svg qt6-wayland qscintilla-qt6 rtmidi - ruby ruby-erb ruby-prime ruby-racc ruby-rexml sc3-plugins supercollider wayland + aubio ruby ruby-racc supercollider + qscintilla-qt6 qt6-base qt6-svg qt6-wayland which ) makedepends=( - base-devel chrpath cmake erlang-headless gendesk git licenses lua m4 ninja qt6-tools - ruby-bundler + 'boost>=1.74.0' # match vendored version + erlang-asn1 erlang-public_key erlang-ssl erlang-parsetools erlang-sasl + elixir git cmake gendesk chrpath qt6-tools + ruby-prime ruby-erb ruby-rexml ) checkdepends=(ruby-rake) optdepends=('sox: for further effects') @@ -24,11 +25,13 @@ source=( $pkgname-$pkgver.tar.gz::https://github.com/sonic-pi-net/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz $pkgname-$pkgver-gui_paths.patch $pkgname-$pkgver-ruby_paths.patch + $pkgname-$pkgver-devendor_boost.patch ) sha512sums=( 'd99d25bbb2e8b556156252140484502ce5bf2869f846b7aff69dae549812d18769b8cd6d9c474be36819d7a831b170553690906d89ece74cd9df2f80289d5892' '625b08cd7b1bbe93f898e36183badafed5e056b18df8d923b2ddb964fe358060501fcf63b9c8a05b95a5d9ab8d6dfb0419a7ed519b511c8e1612a7698df3f44a' 'fa091666d493f302b507a8c8ccaf1992ee64214ec0f45b92198f724fce2b1cee718204afeba4de5ab6d2849a1e9a1933b623054fc459227a15529146d9937d7e' + '841265559a7551d87750dffb4e224da4fdfd0657627ea8c7e61a996c2c854ee5773525b66cb1d750a5193e65f7e5f13cc5729f95d1d3d86b01d7a1a8be97226c' ) prepare() { @@ -39,20 +42,13 @@ prepare() { --name "Sonic Pi" \ --categories "AudioVideo;Audio" - # not sure what this is for - comment for now - # rm -rvf app/server/native - # patch app/gui/qt/{model/sonicpitheme,mainwindow}.cpp to set path to # external components in /usr/{lib,share}/sonic-pi printf "Apply patch to set FHS compliant GUI paths\n" patch -Np1 -i "../$pkgname-$pkgver-gui_paths.patch" -# Commented out all this devendoring stuff for now, will address later -# # devendor qscintilla-qt5: https://github.com/samaaron/sonic-pi/issues/2278 -# printf "Apply patch to devendor qscintilla-qt5\n" -# patch -Np1 -i "../${pkgname}-3.3.1-devendor_qscintilla-qt5.patch" -# printf "Apply patch to devendor boost\n" -# patch -Np1 -i "../${pkgname}-3.3.1-devendor_boost.patch" + printf "Apply patch to devendor boost\n" + patch -Np1 -i "../$pkgname-$pkgver-devendor_boost.patch" # # TODO: devendor ast-2.0.0 # # TODO: devendor atomic (bin) @@ -69,6 +65,7 @@ prepare() { # # TODO: devendor wavefile-0.8.1 # # TODO: devendor websocket-ruby-1.2.8 +# Commented out all this devendoring stuff for now, will address later # # devendor gems requiring compilation: # # ffi, ruby-prof, rugged # sed -e '/rugged/d' \