[arch-commits] Commit in sonic-pi/repos/community-x86_64 (8 files)
David Runge
dvzrv at archlinux.org
Mon Apr 6 22:18:35 UTC 2020
Date: Monday, April 6, 2020 @ 22:18:34
Author: dvzrv
Revision: 612224
archrelease: copy trunk to community-x86_64
Added:
sonic-pi/repos/community-x86_64/PKGBUILD
(from rev 612223, sonic-pi/trunk/PKGBUILD)
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-devendor_qscintilla-qt5.patch
(from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-devendor_qscintilla-qt5.patch)
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-gui_paths.patch
(from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-gui_paths.patch)
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-ruby_paths.patch
(from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-ruby_paths.patch)
Deleted:
sonic-pi/repos/community-x86_64/PKGBUILD
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-devendor_qscintilla-qt5.patch
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-gui_paths.patch
sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-ruby_paths.patch
----------------------------------------------+
PKGBUILD | 436 ++++++++++++-------------
sonic-pi-3.2.0-devendor_qscintilla-qt5.patch | 46 +-
sonic-pi-3.2.0-gui_paths.patch | 152 ++++----
sonic-pi-3.2.0-ruby_paths.patch | 260 +++++++-------
4 files changed, 447 insertions(+), 447 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-06 22:18:27 UTC (rev 612223)
+++ PKGBUILD 2020-04-06 22:18:34 UTC (rev 612224)
@@ -1,218 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=sonic-pi
-pkgver=3.2.1
-pkgrel=2
-pkgdesc="The Live Coding Music Synth for Everyone"
-arch=('x86_64')
-url="https://sonic-pi.net/"
-license=('CCPL' 'LGPL2.1' 'GPL2' 'GPL3' 'MIT')
-groups=('pro-audio')
-depends=('aubio' 'gcc-libs' 'glibc' 'osmid' 'qt5-base' 'qscintilla-qt5' 'ruby'
-'ruby-activesupport' 'ruby-ffi' 'ruby-i18n' 'ruby-kramdown' 'ruby-minitest'
-'ruby-mocha' 'ruby-multi_json' 'ruby-rouge' 'ruby-rugged' 'ruby-sys-proctable'
-'sc3-plugins' 'supercollider')
-makedepends=('boost' 'cmake' 'erlang-nox' 'gendesk' 'lua' 'qt5-tools'
-'ruby-bundler' 'wkhtmltopdf')
-checkdepends=('ruby-rake')
-optdepends=('sox: for further effects')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/samaaron/${pkgname}/archive/v${pkgver}.tar.gz"
- "${pkgname}-3.2.0-gui_paths.patch"
- "${pkgname}-3.2.0-devendor_qscintilla-qt5.patch"
- "${pkgname}-3.2.0-ruby_paths.patch")
-sha512sums=('e38f26cdf9c1f0e3656334bdb2f53000a0ca2292d69ff8f8f7d4742da91dcfe2149efbc32a259d838f725a049292aae6bb04cd392da650540b9cc64c60cbdf39'
- 'e530cc13cb6674dca2ace2a8da566ce28263a15197cf7fccd5d3e58b676c08ce860bc6264a95d26569ff1f923020a40ece1e05841c955c5db16e61c30938f1c0'
- 'fbe196bc332a7a04e8d5097204a13626e7aba3a70715d2a1676c0b1f37f56da427d0d5b417f92c27e64f91a03dd9d4335f65f26f9e9d14e4076d496c94c949af'
- '987504a8b98eea4a3fac2557fcbf002b8d0e9c991922c74e7649546ff963c30d0fef891cecb546f840801c88ec9b82f1afb4cebef9838a53af20d0f3f63a9c39')
-
-prepare() {
- cd "$pkgname-$pkgver"
- gendesk -n \
- --pkgname ${pkgname} \
- --pkgdesc "${pkgdesc}" \
- --name sonic-pi \
- --categories "AudioVideo;Audio"
- 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
- patch -Np1 -i "../${pkgname}-3.2.0-gui_paths.patch"
- # devendor qscintilla-qt5: https://github.com/samaaron/sonic-pi/issues/2278
- patch -Np1 -i "../${pkgname}-3.2.0-devendor_qscintilla-qt5.patch"
- # TODO: devendor boost from GUI components (only headers required during
- # build time)
-
- #TODO: devendor ruby-ast
- #TODO: devendor ruby-atomic (bin)
- #TODO: devendor ruby-benchmark-ips
- #TODO: devendor ruby-blankslate
- #TODO: devendor ruby-did_you_mean (bin)
- #TODO: devendor ruby-fast_osc (bin)
- #TODO: devendor ruby-gettext
- #TODO: devendor ruby-hamster
- #TODO: devendor ruby-interception (bin)
- #TODO: devendor ruby-locale
- #TODO: devendor ruby-memoist
- #TODO: devendor ruby-metaclass
- #TODO: devendor ruby-parser
- #TODO: devendor ruby-parslet
- #TODO: devendor ruby-rubame
- #TODO: devendor ruby-aubio-prerelease
- #TODO: devendor ruby-beautify
- #TODO: devendor ruby-text
- #TODO: devendor ruby-thread_safe
- #TODO: devendor ruby-wavefile
- #TODO: devendor ruby-websocket
-
- # devendor gems requiring compilation:
- # ffi, ruby-prof, rugged
- sed -e '/rugged/d' \
- -e '/ffi/d' \
- -e '/ruby-prof/d' \
- -i app/server/ruby/bin/compile-extensions.rb
- # remove unrequired gems, so we don't create any doc for them
- rm -rvf app/server/ruby/vendor/{activesupport,ffi,i18n,kramdown,minitest,mocha,multi_json,rouge,rugged,sys-proctable}*
- rm -rvf app/server/ruby/vendor/{narray,ruby-coreaudio,ruby-prof,rake-compiler}*
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- (
- # OSC and pi_server
- cd app/server/erlang
- erlc {osc,pi_server}.erl
- )
-
- (
- # ruby extensions
- cd app/server/ruby/bin
- ./compile-extensions.rb
- ./i18n-tool.rb -t
- )
-
- (
- # GUI
- cd app/gui/qt/
- # help template
- cp -vf utils/ruby_help.{tmpl,h}
- ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h
- # generating translations
- lrelease lang/*.ts
- # compiling GUI
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -B build \
- -S .
- make VERBOSE=1 -C build
- )
-
- (
- # patch app/server/ruby/lib/sonicpi/util.rb to set proper paths to external components
- # NOTE: this can only be done after running
- # app/server/ruby/bin/compile-extensions.rb, as ruby-wavefile uses a
- # hardcoded location of a file (move to prepare() after devendoring more ruby gems)
- patch -Np1 -i "../${pkgname}-3.2.0-ruby_paths.patch"
- )
-}
-
-## tests fail: https://github.com/samaaron/sonic-pi/issues/1865
-#check() {
-# cd "$pkgname-$pkgver"
-# cd app/server/ruby/test
-# rake test
-#}
-
-package() {
- cd "$pkgname-$pkgver"
- # GUI executable
- install -vDm 755 "app/gui/qt/build/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
- # book
- install -vDm 644 app/gui/qt/book/*.html \
- -t "${pkgdir}/usr/share/${pkgname}/book"
- # i18n
- install -vDm 644 app/gui/qt/lang/*.qm \
- -t "${pkgdir}/usr/share/${pkgname}/lang"
- # help
- install -vDm 644 app/gui/qt/help/*.html \
- -t "${pkgdir}/usr/share/${pkgname}/help"
- # html
- install -vDm 644 app/gui/qt/html/*.html \
- -t "${pkgdir}/usr/share/${pkgname}/html"
- # images
- install -vDm 644 app/gui/qt/images/*.png \
- -t "${pkgdir}/usr/share/${pkgname}/images"
- install -vDm 644 app/gui/qt/images/coreteam/*.png \
- -t "${pkgdir}/usr/share/${pkgname}/images/coreteam"
- install -vDm 644 app/gui/qt/images/toolbar/default/*.png \
- -t "${pkgdir}/usr/share/${pkgname}/images/toolbar/default"
- install -vDm 644 app/gui/qt/images/toolbar/pro/*.png \
- -t "${pkgdir}/usr/share/${pkgname}/images/toolbar/pro"
- install -vDm 644 etc/doc/images/tutorial/*.png \
- -t "${pkgdir}/usr/share/${pkgname}/images/tutorial"
- # theme
- install -vDm 644 app/gui/qt/theme/app.qss \
- -t "${pkgdir}/usr/share/${pkgname}/theme/"
- install -vDm 644 app/gui/qt/theme/dark/doc-styles.css \
- -t "${pkgdir}/usr/share/${pkgname}/theme/dark"
- install -vDm 644 app/gui/qt/theme/light/doc-styles.css \
- -t "${pkgdir}/usr/share/${pkgname}/theme/light"
- # samples
- install -vDm 644 etc/samples/*.{flac,md} \
- -t "${pkgdir}/usr/share/${pkgname}/samples"
- # snippets
- install -vDm 644 etc/snippets/fx/*.sps \
- -t "${pkgdir}/usr/share/${pkgname}/snippets/fx"
- install -vDm 644 etc/snippets/live_loop/*.sps \
- -t "${pkgdir}/usr/share/${pkgname}/snippets/live_loop"
- install -vDm 644 etc/snippets/syntax/*.sps \
- -t "${pkgdir}/usr/share/${pkgname}/snippets/syntax"
- # synthdefs
- install -vDm 644 etc/synthdefs/compiled/*.scsyndef \
- -t "${pkgdir}/usr/share/${pkgname}/synthdefs/compiled"
- install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/*.clj\
- -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/"
- install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/src/sonic_pi/*.clj\
- -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/sonic_pi/src"
- install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/test/sonic_pi/*.clj\
- -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/sonic_pi/test"
- # buffers
- install -vDm 644 etc/buffers/rand-stream.wav \
- -t "${pkgdir}/usr/share/${pkgname}/buffers"
- # docs
- install -vDm 644 etc/doc/cheatsheets/*.md \
- -t "${pkgdir}/usr/share/doc/${pkgname}/cheatsheets"
- # pdfs
- install -vDm 644 etc/synthdefs/graphviz/pdf/*.pdf \
- -t "${pkgdir}/usr/share/doc/${pkgname}/synthdefs"
- # tutorial
- install -vDm 644 etc/doc/tutorial/*.md \
- -t "${pkgdir}/usr/share/doc/${pkgname}/tutorial"
- # examples
- install -vDm 644 etc/examples/algomancer/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/algomancer"
- install -vDm 644 etc/examples/apprentice/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/apprentice"
- install -vDm 644 etc/examples/illusionist/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/illusionist"
- install -vDm 644 etc/examples/incubation/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/incubation"
- install -vDm 644 etc/examples/magician/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/magician"
- install -vDm 644 etc/examples/sorcerer/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/sorcerer"
- install -vDm 644 etc/examples/wizard/*.rb \
- -t "${pkgdir}/usr/share/doc/${pkgname}/examples/wizard"
- # erlang
- install -vDm 755 app/server/erlang/*.beam \
- -t "${pkgdir}/usr/lib/${pkgname}"
- # ruby
- install -vdm 755 "${pkgdir}/usr/share/${pkgname}"
- cp -av app/server/ruby "${pkgdir}/usr/lib/${pkgname}/server"
- rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/ext/*.{o,c}
- rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/ext/*/*.{o,c}
- rm -fv "${pkgdir}/usr/lib/${pkgname}/server/Rakefile"
- rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/Rakefile
- # xdg
- install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
- # license
- install -vDm 644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: sonic-pi/repos/community-x86_64/PKGBUILD (from rev 612223, sonic-pi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-06 22:18:34 UTC (rev 612224)
@@ -0,0 +1,218 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=sonic-pi
+pkgver=3.2.2
+pkgrel=1
+pkgdesc="The Live Coding Music Synth for Everyone"
+arch=('x86_64')
+url="https://sonic-pi.net/"
+license=('CCPL' 'LGPL2.1' 'GPL2' 'GPL3' 'MIT')
+groups=('pro-audio')
+depends=('aubio' 'gcc-libs' 'glibc' 'osmid' 'qt5-base' 'qscintilla-qt5' 'ruby'
+'ruby-activesupport' 'ruby-ffi' 'ruby-i18n' 'ruby-kramdown' 'ruby-minitest'
+'ruby-mocha' 'ruby-multi_json' 'ruby-rouge' 'ruby-rugged' 'ruby-sys-proctable'
+'sc3-plugins' 'supercollider')
+makedepends=('boost' 'cmake' 'erlang-nox' 'gendesk' 'lua' 'qt5-tools'
+'ruby-bundler' 'wkhtmltopdf')
+checkdepends=('ruby-rake')
+optdepends=('sox: for further effects')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/samaaron/${pkgname}/archive/v${pkgver}.tar.gz"
+ "${pkgname}-3.2.0-gui_paths.patch"
+ "${pkgname}-3.2.0-devendor_qscintilla-qt5.patch"
+ "${pkgname}-3.2.0-ruby_paths.patch")
+sha512sums=('07e2d07c51a8312db0145a7be5c6c99b2baa6f913bcb27449e3ab0382945f49c5f6451c899cb58407a11d3e05abf6a0d02f0efd07b2e90ad84fdc7c602332a76'
+ 'e530cc13cb6674dca2ace2a8da566ce28263a15197cf7fccd5d3e58b676c08ce860bc6264a95d26569ff1f923020a40ece1e05841c955c5db16e61c30938f1c0'
+ 'fbe196bc332a7a04e8d5097204a13626e7aba3a70715d2a1676c0b1f37f56da427d0d5b417f92c27e64f91a03dd9d4335f65f26f9e9d14e4076d496c94c949af'
+ '987504a8b98eea4a3fac2557fcbf002b8d0e9c991922c74e7649546ff963c30d0fef891cecb546f840801c88ec9b82f1afb4cebef9838a53af20d0f3f63a9c39')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ gendesk -n \
+ --pkgname ${pkgname} \
+ --pkgdesc "${pkgdesc}" \
+ --name sonic-pi \
+ --categories "AudioVideo;Audio"
+ 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
+ patch -Np1 -i "../${pkgname}-3.2.0-gui_paths.patch"
+ # devendor qscintilla-qt5: https://github.com/samaaron/sonic-pi/issues/2278
+ patch -Np1 -i "../${pkgname}-3.2.0-devendor_qscintilla-qt5.patch"
+ # TODO: devendor boost from GUI components (only headers required during
+ # build time)
+
+ #TODO: devendor ruby-ast
+ #TODO: devendor ruby-atomic (bin)
+ #TODO: devendor ruby-benchmark-ips
+ #TODO: devendor ruby-blankslate
+ #TODO: devendor ruby-did_you_mean (bin)
+ #TODO: devendor ruby-fast_osc (bin)
+ #TODO: devendor ruby-gettext
+ #TODO: devendor ruby-hamster
+ #TODO: devendor ruby-interception (bin)
+ #TODO: devendor ruby-locale
+ #TODO: devendor ruby-memoist
+ #TODO: devendor ruby-metaclass
+ #TODO: devendor ruby-parser
+ #TODO: devendor ruby-parslet
+ #TODO: devendor ruby-rubame
+ #TODO: devendor ruby-aubio-prerelease
+ #TODO: devendor ruby-beautify
+ #TODO: devendor ruby-text
+ #TODO: devendor ruby-thread_safe
+ #TODO: devendor ruby-wavefile
+ #TODO: devendor ruby-websocket
+
+ # devendor gems requiring compilation:
+ # ffi, ruby-prof, rugged
+ sed -e '/rugged/d' \
+ -e '/ffi/d' \
+ -e '/ruby-prof/d' \
+ -i app/server/ruby/bin/compile-extensions.rb
+ # remove unrequired gems, so we don't create any doc for them
+ rm -rvf app/server/ruby/vendor/{activesupport,ffi,i18n,kramdown,minitest,mocha,multi_json,rouge,rugged,sys-proctable}*
+ rm -rvf app/server/ruby/vendor/{narray,ruby-coreaudio,ruby-prof,rake-compiler}*
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ (
+ # OSC and pi_server
+ cd app/server/erlang
+ erlc {osc,pi_server}.erl
+ )
+
+ (
+ # ruby extensions
+ cd app/server/ruby/bin
+ ./compile-extensions.rb
+ ./i18n-tool.rb -t
+ )
+
+ (
+ # GUI
+ cd app/gui/qt/
+ # help template
+ cp -vf utils/ruby_help.{tmpl,h}
+ ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h
+ # generating translations
+ lrelease lang/*.ts
+ # compiling GUI
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -B build \
+ -S .
+ make VERBOSE=1 -C build
+ )
+
+ (
+ # patch app/server/ruby/lib/sonicpi/util.rb to set proper paths to external components
+ # NOTE: this can only be done after running
+ # app/server/ruby/bin/compile-extensions.rb, as ruby-wavefile uses a
+ # hardcoded location of a file (move to prepare() after devendoring more ruby gems)
+ patch -Np1 -i "../${pkgname}-3.2.0-ruby_paths.patch"
+ )
+}
+
+## tests fail: https://github.com/samaaron/sonic-pi/issues/1865
+#check() {
+# cd "$pkgname-$pkgver"
+# cd app/server/ruby/test
+# rake test
+#}
+
+package() {
+ cd "$pkgname-$pkgver"
+ # GUI executable
+ install -vDm 755 "app/gui/qt/build/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+ # book
+ install -vDm 644 app/gui/qt/book/*.html \
+ -t "${pkgdir}/usr/share/${pkgname}/book"
+ # i18n
+ install -vDm 644 app/gui/qt/lang/*.qm \
+ -t "${pkgdir}/usr/share/${pkgname}/lang"
+ # help
+ install -vDm 644 app/gui/qt/help/*.html \
+ -t "${pkgdir}/usr/share/${pkgname}/help"
+ # html
+ install -vDm 644 app/gui/qt/html/*.html \
+ -t "${pkgdir}/usr/share/${pkgname}/html"
+ # images
+ install -vDm 644 app/gui/qt/images/*.png \
+ -t "${pkgdir}/usr/share/${pkgname}/images"
+ install -vDm 644 app/gui/qt/images/coreteam/*.png \
+ -t "${pkgdir}/usr/share/${pkgname}/images/coreteam"
+ install -vDm 644 app/gui/qt/images/toolbar/default/*.png \
+ -t "${pkgdir}/usr/share/${pkgname}/images/toolbar/default"
+ install -vDm 644 app/gui/qt/images/toolbar/pro/*.png \
+ -t "${pkgdir}/usr/share/${pkgname}/images/toolbar/pro"
+ install -vDm 644 etc/doc/images/tutorial/*.png \
+ -t "${pkgdir}/usr/share/${pkgname}/images/tutorial"
+ # theme
+ install -vDm 644 app/gui/qt/theme/app.qss \
+ -t "${pkgdir}/usr/share/${pkgname}/theme/"
+ install -vDm 644 app/gui/qt/theme/dark/doc-styles.css \
+ -t "${pkgdir}/usr/share/${pkgname}/theme/dark"
+ install -vDm 644 app/gui/qt/theme/light/doc-styles.css \
+ -t "${pkgdir}/usr/share/${pkgname}/theme/light"
+ # samples
+ install -vDm 644 etc/samples/*.{flac,md} \
+ -t "${pkgdir}/usr/share/${pkgname}/samples"
+ # snippets
+ install -vDm 644 etc/snippets/fx/*.sps \
+ -t "${pkgdir}/usr/share/${pkgname}/snippets/fx"
+ install -vDm 644 etc/snippets/live_loop/*.sps \
+ -t "${pkgdir}/usr/share/${pkgname}/snippets/live_loop"
+ install -vDm 644 etc/snippets/syntax/*.sps \
+ -t "${pkgdir}/usr/share/${pkgname}/snippets/syntax"
+ # synthdefs
+ install -vDm 644 etc/synthdefs/compiled/*.scsyndef \
+ -t "${pkgdir}/usr/share/${pkgname}/synthdefs/compiled"
+ install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/*.clj\
+ -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/"
+ install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/src/sonic_pi/*.clj\
+ -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/sonic_pi/src"
+ install -vDm 644 etc/synthdefs/designs/overtone/${pkgname}/test/sonic_pi/*.clj\
+ -t "${pkgdir}/usr/share/${pkgname}/synthdefs/designs/overtone/sonic_pi/test"
+ # buffers
+ install -vDm 644 etc/buffers/rand-stream.wav \
+ -t "${pkgdir}/usr/share/${pkgname}/buffers"
+ # docs
+ install -vDm 644 etc/doc/cheatsheets/*.md \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/cheatsheets"
+ # pdfs
+ install -vDm 644 etc/synthdefs/graphviz/pdf/*.pdf \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/synthdefs"
+ # tutorial
+ install -vDm 644 etc/doc/tutorial/*.md \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/tutorial"
+ # examples
+ install -vDm 644 etc/examples/algomancer/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/algomancer"
+ install -vDm 644 etc/examples/apprentice/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/apprentice"
+ install -vDm 644 etc/examples/illusionist/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/illusionist"
+ install -vDm 644 etc/examples/incubation/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/incubation"
+ install -vDm 644 etc/examples/magician/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/magician"
+ install -vDm 644 etc/examples/sorcerer/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/sorcerer"
+ install -vDm 644 etc/examples/wizard/*.rb \
+ -t "${pkgdir}/usr/share/doc/${pkgname}/examples/wizard"
+ # erlang
+ install -vDm 755 app/server/erlang/*.beam \
+ -t "${pkgdir}/usr/lib/${pkgname}"
+ # ruby
+ install -vdm 755 "${pkgdir}/usr/share/${pkgname}"
+ cp -av app/server/ruby "${pkgdir}/usr/lib/${pkgname}/server"
+ rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/ext/*.{o,c}
+ rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/ext/*/*.{o,c}
+ rm -fv "${pkgdir}/usr/lib/${pkgname}/server/Rakefile"
+ rm -fv "${pkgdir}/usr/lib/${pkgname}/server/vendor/"*/Rakefile
+ # xdg
+ install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
+ # license
+ install -vDm 644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: sonic-pi-3.2.0-devendor_qscintilla-qt5.patch
===================================================================
--- sonic-pi-3.2.0-devendor_qscintilla-qt5.patch 2020-04-06 22:18:27 UTC (rev 612223)
+++ sonic-pi-3.2.0-devendor_qscintilla-qt5.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -1,23 +0,0 @@
-diff -ruN a/app/gui/qt/CMakeLists.txt c/app/gui/qt/CMakeLists.txt
---- a/app/gui/qt/CMakeLists.txt 2020-02-25 01:23:45.000000000 +0100
-+++ c/app/gui/qt/CMakeLists.txt 2020-03-08 16:54:34.158555996 +0100
-@@ -38,9 +38,7 @@
-
- find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED)
- find_package(Threads REQUIRED)
--
--# We build scintilla as part of the main project to make it easy to debug/fix
--add_subdirectory(external/QScintilla-2.11.4)
-+find_library(QSCINTILLA_QT5 qscintilla2_qt5)
-
- set(APP_NAME sonic-pi)
-
-@@ -129,7 +127,7 @@
-
- target_link_libraries(${APP_NAME}
- PRIVATE
-- QScintilla
-+ ${QSCINTILLA_QT5}
- Qt5::Core
- Qt5::Gui
- Qt5::Widgets
Copied: sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-devendor_qscintilla-qt5.patch (from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-devendor_qscintilla-qt5.patch)
===================================================================
--- sonic-pi-3.2.0-devendor_qscintilla-qt5.patch (rev 0)
+++ sonic-pi-3.2.0-devendor_qscintilla-qt5.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -0,0 +1,23 @@
+diff -ruN a/app/gui/qt/CMakeLists.txt c/app/gui/qt/CMakeLists.txt
+--- a/app/gui/qt/CMakeLists.txt 2020-02-25 01:23:45.000000000 +0100
++++ c/app/gui/qt/CMakeLists.txt 2020-03-08 16:54:34.158555996 +0100
+@@ -38,9 +38,7 @@
+
+ find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED)
+ find_package(Threads REQUIRED)
+-
+-# We build scintilla as part of the main project to make it easy to debug/fix
+-add_subdirectory(external/QScintilla-2.11.4)
++find_library(QSCINTILLA_QT5 qscintilla2_qt5)
+
+ set(APP_NAME sonic-pi)
+
+@@ -129,7 +127,7 @@
+
+ target_link_libraries(${APP_NAME}
+ PRIVATE
+- QScintilla
++ ${QSCINTILLA_QT5}
+ Qt5::Core
+ Qt5::Gui
+ Qt5::Widgets
Deleted: sonic-pi-3.2.0-gui_paths.patch
===================================================================
--- sonic-pi-3.2.0-gui_paths.patch 2020-04-06 22:18:27 UTC (rev 612223)
+++ sonic-pi-3.2.0-gui_paths.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -1,76 +0,0 @@
-diff -ruN a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
---- a/app/gui/qt/mainwindow.cpp 2020-02-25 01:23:45.000000000 +0100
-+++ b/app/gui/qt/mainwindow.cpp 2020-03-08 13:53:17.604508214 +0100
-@@ -353,10 +353,10 @@
- ruby_path = "ruby";
- }
-
-- ruby_server_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/sonic-pi-server.rb");
-- port_discovery_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/port-discovery.rb");
-- fetch_url_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/fetch-url.rb");
-- sample_path = QDir::toNativeSeparators(root_path + "/etc/samples");
-+ ruby_server_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/sonic-pi-server.rb");
-+ port_discovery_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/port-discovery.rb");
-+ fetch_url_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/fetch-url.rb");
-+ sample_path = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/samples");
-
- sp_user_path = QDir::toNativeSeparators(sonicPiHomePath() + "/.sonic-pi");
- sp_user_tmp_path = QDir::toNativeSeparators(sp_user_path + "/.writableTesterPath");
-@@ -367,14 +367,14 @@
- process_log_path = QDir::toNativeSeparators(log_path + "/processes.log");
- scsynth_log_path = QDir::toNativeSeparators(log_path + QDir::separator() + "scsynth.log");
-
-- init_script_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/init-script.rb");
-- exit_script_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/exit-script.rb");
-+ init_script_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/init-script.rb");
-+ exit_script_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/exit-script.rb");
-
-- qt_app_theme_path = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/app.qss");
-+ qt_app_theme_path = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/app.qss");
-
-- qt_browser_dark_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/dark/doc-styles.css");
-- qt_browser_light_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/light/doc-styles.css");
-- qt_browser_hc_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/high_contrast/doc-styles.css");
-+ qt_browser_dark_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
-+ qt_browser_light_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/light/doc-styles.css");
-+ qt_browser_hc_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
-
- // attempt to create log directory
- QDir logDir(log_path);
-@@ -1056,7 +1056,7 @@
- return QCoreApplication::applicationDirPath() + "/../../../../..";
- #else
- // On linux, CMake builds app into the build folder
-- return QCoreApplication::applicationDirPath() + "/../../../..";
-+ return QCoreApplication::applicationDirPath() + "/../..";
- #endif
- }
-
-@@ -1098,7 +1098,7 @@
- // Register server pid for potential zombie clearing
- QStringList regServerArgs;
- #if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
-- regServerArgs << QDir::toNativeSeparators(rootPath() + "/app/server/ruby/bin/task-register.rb")<< QString::number(serverProcess->processId());
-+ regServerArgs << QDir::toNativeSeparators(rootPath() + "/usr/lib/sonic-pi/server/bin/task-register.rb")<< QString::number(serverProcess->processId());
- #endif
- QProcess *regServerProcess = new QProcess();
- regServerProcess->start(ruby_path, regServerArgs);
-diff -ruN a/app/gui/qt/model/sonicpitheme.cpp b/app/gui/qt/model/sonicpitheme.cpp
---- a/app/gui/qt/model/sonicpitheme.cpp 2020-02-25 01:23:45.000000000 +0100
-+++ b/app/gui/qt/model/sonicpitheme.cpp 2020-03-08 19:59:00.840045897 +0100
-@@ -25,11 +25,11 @@
- this->customSettingsFilename = customSettingsFilename;
- this->rootPath = rootPath;
-
-- qt_app_theme_path = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/app.qss");
-+ qt_app_theme_path = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/app.qss");
-
-- qt_browser_dark_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/dark/doc-styles.css");
-- qt_browser_light_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/light/doc-styles.css");
-- qt_browser_hc_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/high_contrast/doc-styles.css");
-+ qt_browser_dark_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
-+ qt_browser_light_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/light/doc-styles.css");
-+ qt_browser_hc_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
-
- loadToolBarIcons();
-
Copied: sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-gui_paths.patch (from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-gui_paths.patch)
===================================================================
--- sonic-pi-3.2.0-gui_paths.patch (rev 0)
+++ sonic-pi-3.2.0-gui_paths.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -0,0 +1,76 @@
+diff -ruN a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
+--- a/app/gui/qt/mainwindow.cpp 2020-02-25 01:23:45.000000000 +0100
++++ b/app/gui/qt/mainwindow.cpp 2020-03-08 13:53:17.604508214 +0100
+@@ -353,10 +353,10 @@
+ ruby_path = "ruby";
+ }
+
+- ruby_server_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/sonic-pi-server.rb");
+- port_discovery_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/port-discovery.rb");
+- fetch_url_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/fetch-url.rb");
+- sample_path = QDir::toNativeSeparators(root_path + "/etc/samples");
++ ruby_server_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/sonic-pi-server.rb");
++ port_discovery_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/port-discovery.rb");
++ fetch_url_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/fetch-url.rb");
++ sample_path = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/samples");
+
+ sp_user_path = QDir::toNativeSeparators(sonicPiHomePath() + "/.sonic-pi");
+ sp_user_tmp_path = QDir::toNativeSeparators(sp_user_path + "/.writableTesterPath");
+@@ -367,14 +367,14 @@
+ process_log_path = QDir::toNativeSeparators(log_path + "/processes.log");
+ scsynth_log_path = QDir::toNativeSeparators(log_path + QDir::separator() + "scsynth.log");
+
+- init_script_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/init-script.rb");
+- exit_script_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/exit-script.rb");
++ init_script_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/init-script.rb");
++ exit_script_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/exit-script.rb");
+
+- qt_app_theme_path = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/app.qss");
++ qt_app_theme_path = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/app.qss");
+
+- qt_browser_dark_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/dark/doc-styles.css");
+- qt_browser_light_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/light/doc-styles.css");
+- qt_browser_hc_css = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/high_contrast/doc-styles.css");
++ qt_browser_dark_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
++ qt_browser_light_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/light/doc-styles.css");
++ qt_browser_hc_css = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
+
+ // attempt to create log directory
+ QDir logDir(log_path);
+@@ -1056,7 +1056,7 @@
+ return QCoreApplication::applicationDirPath() + "/../../../../..";
+ #else
+ // On linux, CMake builds app into the build folder
+- return QCoreApplication::applicationDirPath() + "/../../../..";
++ return QCoreApplication::applicationDirPath() + "/../..";
+ #endif
+ }
+
+@@ -1098,7 +1098,7 @@
+ // Register server pid for potential zombie clearing
+ QStringList regServerArgs;
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
+- regServerArgs << QDir::toNativeSeparators(rootPath() + "/app/server/ruby/bin/task-register.rb")<< QString::number(serverProcess->processId());
++ regServerArgs << QDir::toNativeSeparators(rootPath() + "/usr/lib/sonic-pi/server/bin/task-register.rb")<< QString::number(serverProcess->processId());
+ #endif
+ QProcess *regServerProcess = new QProcess();
+ regServerProcess->start(ruby_path, regServerArgs);
+diff -ruN a/app/gui/qt/model/sonicpitheme.cpp b/app/gui/qt/model/sonicpitheme.cpp
+--- a/app/gui/qt/model/sonicpitheme.cpp 2020-02-25 01:23:45.000000000 +0100
++++ b/app/gui/qt/model/sonicpitheme.cpp 2020-03-08 19:59:00.840045897 +0100
+@@ -25,11 +25,11 @@
+ this->customSettingsFilename = customSettingsFilename;
+ this->rootPath = rootPath;
+
+- qt_app_theme_path = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/app.qss");
++ qt_app_theme_path = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/app.qss");
+
+- qt_browser_dark_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/dark/doc-styles.css");
+- qt_browser_light_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/light/doc-styles.css");
+- qt_browser_hc_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/high_contrast/doc-styles.css");
++ qt_browser_dark_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
++ qt_browser_light_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/light/doc-styles.css");
++ qt_browser_hc_css = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
+
+ loadToolBarIcons();
+
Deleted: sonic-pi-3.2.0-ruby_paths.patch
===================================================================
--- sonic-pi-3.2.0-ruby_paths.patch 2020-04-06 22:18:27 UTC (rev 612223)
+++ sonic-pi-3.2.0-ruby_paths.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -1,130 +0,0 @@
-diff -ruN a/app/server/ruby/core.rb d/app/server/ruby/core.rb
---- a/app/server/ruby/core.rb 2020-02-25 01:23:45.000000000 +0100
-+++ d/app/server/ruby/core.rb 2020-03-08 21:29:51.417948839 +0100
-@@ -146,7 +146,7 @@
- module Core
- module SPRand
- # Read in same random numbers as server for random stream sync
-- @@random_numbers = ::WaveFile::Reader.new(File.expand_path("../../../../etc/buffers/rand-stream.wav", __FILE__), ::WaveFile::Format.new(:mono, :float, 44100)).read(441000).samples.freeze
-+ @@random_numbers = ::WaveFile::Reader.new(File.expand_path("/usr/share/sonic-pi/buffers/rand-stream.wav", __FILE__), ::WaveFile::Format.new(:mono, :float, 44100)).read(441000).samples.freeze
-
- def self.tl_seed_map(seed, idx=0)
- {:sonic_pi_spider_random_gen_seed => seed,
-diff -ruN a/app/server/ruby/lib/sonicpi/util.rb d/app/server/ruby/lib/sonicpi/util.rb
---- a/app/server/ruby/lib/sonicpi/util.rb 2020-02-25 01:23:45.000000000 +0100
-+++ d/app/server/ruby/lib/sonicpi/util.rb 2020-03-09 19:16:54.479452971 +0100
-@@ -252,11 +252,11 @@
- end
-
- def root_path
-- File.absolute_path("#{File.dirname(__FILE__)}/../../../../../")
-+ File.absolute_path("/usr/share/sonic-pi")
- end
-
- def etc_path
-- File.absolute_path("#{root_path}/etc")
-+ File.absolute_path("#{root_path}")
- end
-
- def snippets_path
-@@ -264,7 +264,7 @@
- end
-
- def doc_path
-- File.absolute_path("#{etc_path}/doc")
-+ File.absolute_path("/usr/share/doc/sonic-pi")
- end
-
- def cheatsheets_path
-@@ -276,7 +276,7 @@
- end
-
- def tmp_path
-- File.absolute_path("#{root_path}/tmp")
-+ File.absolute_path("/tmp")
- end
-
- def synthdef_path
-@@ -292,19 +292,20 @@
- end
-
- def app_path
-- File.absolute_path("#{root_path}/app")
-+ File.absolute_path("/usr/lib/sonic-pi")
- end
-
- def html_public_path
-- File.absolute_path("#{app_path}/gui/html/public")
-+ File.absolute_path("#{doc_path}/gui/html/public")
- end
-
-+ # this path is only relevant during build time
- def qt_gui_path
- File.absolute_path("#{app_path}/gui/qt")
- end
-
- def examples_path
-- File.absolute_path("#{etc_path}/examples")
-+ File.absolute_path("#{doc_path}/examples")
- end
-
- def server_path
-@@ -312,7 +313,7 @@
- end
-
- def server_bin_path
-- File.absolute_path("#{server_path}/ruby/bin")
-+ File.absolute_path("#{server_path}/bin")
- end
-
- def native_path
-@@ -320,15 +321,15 @@
- end
-
- def sox_path
-- File.join(native_path, "sox", __exe_fix("sox"))
-+ File.absolute_path("/usr/bin/sox")
- end
-
- def osmid_o2m_path
-- File.join(native_path, "osmid", __exe_fix("o2m"))
-+ File.absolute_path("/usr/bin/o2m")
- end
-
- def osmid_m2o_path
-- File.join(native_path, "osmid", __exe_fix("m2o"))
-+ File.absolute_path("/usr/bin/m2o")
- end
-
- def scsynth_log_path
-@@ -373,7 +374,7 @@
- end
-
- def erlang_server_path
-- File.join(server_path, "erlang")
-+ File.absolute_path("/usr/lib/sonic-pi")
- end
-
- def user_settings_path
-diff -ruN a/app/server/ruby/util.rb d/app/server/ruby/util.rb
---- a/app/server/ruby/util.rb 2020-02-25 01:23:45.000000000 +0100
-+++ d/app/server/ruby/util.rb 2020-03-08 21:43:42.229538721 +0100
-@@ -12,15 +12,15 @@
- #++
-
- def sp_sonic_pi_path()
-- File.absolute_path("#{File.dirname(__FILE__)}/../../")
-+ File.absolute_path("#{File.dirname(__FILE__)}/..")
- end
-
- def sp_scripts_path()
-- File.absolute_path("#{sp_sonic_pi_path}/app/scripts")
-+ File.absolute_path("#{sp_sonic_pi_path}/scripts")
- end
-
- def sp_synthdefs_path()
-- File.absolute_path("#{sp_sonic_pi_path}/app/etc/synthdefs/compiled")
-+ File.absolute_path("#{sp_sonic_pi_path}/synthdefs/compiled")
- end
-
- def spider_log(message)
Copied: sonic-pi/repos/community-x86_64/sonic-pi-3.2.0-ruby_paths.patch (from rev 612223, sonic-pi/trunk/sonic-pi-3.2.0-ruby_paths.patch)
===================================================================
--- sonic-pi-3.2.0-ruby_paths.patch (rev 0)
+++ sonic-pi-3.2.0-ruby_paths.patch 2020-04-06 22:18:34 UTC (rev 612224)
@@ -0,0 +1,130 @@
+diff -ruN a/app/server/ruby/core.rb d/app/server/ruby/core.rb
+--- a/app/server/ruby/core.rb 2020-02-25 01:23:45.000000000 +0100
++++ d/app/server/ruby/core.rb 2020-03-08 21:29:51.417948839 +0100
+@@ -146,7 +146,7 @@
+ module Core
+ module SPRand
+ # Read in same random numbers as server for random stream sync
+- @@random_numbers = ::WaveFile::Reader.new(File.expand_path("../../../../etc/buffers/rand-stream.wav", __FILE__), ::WaveFile::Format.new(:mono, :float, 44100)).read(441000).samples.freeze
++ @@random_numbers = ::WaveFile::Reader.new(File.expand_path("/usr/share/sonic-pi/buffers/rand-stream.wav", __FILE__), ::WaveFile::Format.new(:mono, :float, 44100)).read(441000).samples.freeze
+
+ def self.tl_seed_map(seed, idx=0)
+ {:sonic_pi_spider_random_gen_seed => seed,
+diff -ruN a/app/server/ruby/lib/sonicpi/util.rb d/app/server/ruby/lib/sonicpi/util.rb
+--- a/app/server/ruby/lib/sonicpi/util.rb 2020-02-25 01:23:45.000000000 +0100
++++ d/app/server/ruby/lib/sonicpi/util.rb 2020-03-09 19:16:54.479452971 +0100
+@@ -252,11 +252,11 @@
+ end
+
+ def root_path
+- File.absolute_path("#{File.dirname(__FILE__)}/../../../../../")
++ File.absolute_path("/usr/share/sonic-pi")
+ end
+
+ def etc_path
+- File.absolute_path("#{root_path}/etc")
++ File.absolute_path("#{root_path}")
+ end
+
+ def snippets_path
+@@ -264,7 +264,7 @@
+ end
+
+ def doc_path
+- File.absolute_path("#{etc_path}/doc")
++ File.absolute_path("/usr/share/doc/sonic-pi")
+ end
+
+ def cheatsheets_path
+@@ -276,7 +276,7 @@
+ end
+
+ def tmp_path
+- File.absolute_path("#{root_path}/tmp")
++ File.absolute_path("/tmp")
+ end
+
+ def synthdef_path
+@@ -292,19 +292,20 @@
+ end
+
+ def app_path
+- File.absolute_path("#{root_path}/app")
++ File.absolute_path("/usr/lib/sonic-pi")
+ end
+
+ def html_public_path
+- File.absolute_path("#{app_path}/gui/html/public")
++ File.absolute_path("#{doc_path}/gui/html/public")
+ end
+
++ # this path is only relevant during build time
+ def qt_gui_path
+ File.absolute_path("#{app_path}/gui/qt")
+ end
+
+ def examples_path
+- File.absolute_path("#{etc_path}/examples")
++ File.absolute_path("#{doc_path}/examples")
+ end
+
+ def server_path
+@@ -312,7 +313,7 @@
+ end
+
+ def server_bin_path
+- File.absolute_path("#{server_path}/ruby/bin")
++ File.absolute_path("#{server_path}/bin")
+ end
+
+ def native_path
+@@ -320,15 +321,15 @@
+ end
+
+ def sox_path
+- File.join(native_path, "sox", __exe_fix("sox"))
++ File.absolute_path("/usr/bin/sox")
+ end
+
+ def osmid_o2m_path
+- File.join(native_path, "osmid", __exe_fix("o2m"))
++ File.absolute_path("/usr/bin/o2m")
+ end
+
+ def osmid_m2o_path
+- File.join(native_path, "osmid", __exe_fix("m2o"))
++ File.absolute_path("/usr/bin/m2o")
+ end
+
+ def scsynth_log_path
+@@ -373,7 +374,7 @@
+ end
+
+ def erlang_server_path
+- File.join(server_path, "erlang")
++ File.absolute_path("/usr/lib/sonic-pi")
+ end
+
+ def user_settings_path
+diff -ruN a/app/server/ruby/util.rb d/app/server/ruby/util.rb
+--- a/app/server/ruby/util.rb 2020-02-25 01:23:45.000000000 +0100
++++ d/app/server/ruby/util.rb 2020-03-08 21:43:42.229538721 +0100
+@@ -12,15 +12,15 @@
+ #++
+
+ def sp_sonic_pi_path()
+- File.absolute_path("#{File.dirname(__FILE__)}/../../")
++ File.absolute_path("#{File.dirname(__FILE__)}/..")
+ end
+
+ def sp_scripts_path()
+- File.absolute_path("#{sp_sonic_pi_path}/app/scripts")
++ File.absolute_path("#{sp_sonic_pi_path}/scripts")
+ end
+
+ def sp_synthdefs_path()
+- File.absolute_path("#{sp_sonic_pi_path}/app/etc/synthdefs/compiled")
++ File.absolute_path("#{sp_sonic_pi_path}/synthdefs/compiled")
+ end
+
+ def spider_log(message)
More information about the arch-commits
mailing list