On 27/06/2019 10:03, Hanno Zulla wrote:
Hi Peter,
I am that former maintainer of the Sonic Pi package.
Thank you for picking up the pieces, it's good to see that there is new
interest in the package.
Unfortunately after working through a bunch of path issues, missing
dependencies etc it's failing to run with.
sonic-pi: /usr/include/boost/interprocess/segment_manager.hpp:861: void* boost::interprocess::segment_manager<CharType,
MemoryAlgorithm, IndexType>::priv_generic_find(const CharT*, IndexType<boost::interprocess::ipcdetail::index_config<CharT,
MemoryAlgorithm> >&, boost::interprocess::ipcdetail::in_place_interface&,
boost::interprocess::segment_manager<CharType, MemoryAlgorithm, IndexType>::size_type&, boost::interprocess::ipcdetail::true_,
bool) [with CharT = char; CharType = char; MemoryAlgorithm =
boost::interprocess::rbtree_best_fit<boost::interprocess::mutex_family>; IndexType = boost::interprocess::iset_index;
boost::interprocess::segment_manager<CharType, MemoryAlgorithm, IndexType>::size_type = unsigned int;
boost::interprocess::ipcdetail::true_ = boost::interprocess::ipcdetail::bool_<true>]: Assertion `(ctrl_data->m_value_bytes %
table.size) == 0' failed.
Any clue what might cause this? has anyone seen any similar issues before in
other software. Grepping the source tree doesn't find any matches for ctrl_data
or m_value_bytes in source files (though it does find them in build
intermediate files).
This was reported upstream a while back but was closed as "we don't currently have
the resources to support generic linux".
https://github.com/samaaron/sonic-pi/issues/1805
A diff of the "debian" directory is attatched to this mail. I have uploaded the
complete source package with raspbian buster binaries (should also run on debian buster
armf) to https://plugwash.raspbian.org/sonic-pi/
Note: I know a bunch of cleanup will be needed to update the copyright file,
excluded files in the source package etc. But i'll only bother doing that work
if I can actually get the software to run.
You probably already found the "packaging readme" I had left in the Debian
source package.
I didn't actually. Maybe I should have.
diff -ur sonic-pi-2.10.0~repack/debian/changelog sonic-pi-3.1.0~repack~test-1/debian/changelog
--- sonic-pi-2.10.0~repack/debian/changelog 2018-01-04 11:57:23.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/changelog 2019-06-27 13:05:58.183105947 +0100
@@ -1,3 +1,40 @@
+sonic-pi (3.1.0~repack~test-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Disable 01-remove-rpi-volume.patch, it doesn't apply in it's present state
+ and it's not clear if it is relavent anymore.
+ * Update 02-do-no-require-unused-ruby-gems.patch to apply to new upstream
+ source.
+ * Update 03-use-debian-gems.patch to apply to new upstream source
+ (note: some of the removed code has disappeared, possiblly needs further
+ investigation)
+ * Update paths in 04-rename-ruby-beautify-legacy.patch and refresh
+ patch for fuzz.
+ * Update paths in 05-doc-base-index.patch
+ * Disable 06-paths.patch, it seems this fix was merged upstream, and then
+ later the code in question was eliminated.
+ * Update path in debian/patches/07-examples-path.patch
+ * Update qsci_rename.patch for upstream changes.
+ * undo removal of os detection in 03-use-debian-gems.patch, other
+ code in the file depends on it.
+ * undo removal of "ruby-api" retrival in 03-use-debian-gems.patch, other
+ code in the file depends on it.
+ * explicitly used vendor version of some deps that are not in Debian.
+ * Add depends and build-depends on ruby-ffi
+ * Add depends and build-depends on libaubio5
+ * Modify 07-examples-path.patch to use the FHS path unconditionally as
+ "linux_fhs" no longer seems to exist.
+ * Add build-depends on libqwt-qt5-dev.
+ * Update many paths in debian/rules.
+ * Disable two failing tests for now (see https://github.com/samaaron/sonic-pi/issues/1865 )
+ * Update paths in install files.
+ * Revert upstream removal of fhs support.
+ * Add build-depends on libqt5svg5-dev.
+ * Add build-depends on libboost-dev.
+ * Add dependency on ruby-memoist.
+
+ -- root <root@cuboxi4x4> Wed, 26 Jun 2019 22:12:52 +0000
+
sonic-pi (2.10.0~repack-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -ur sonic-pi-2.10.0~repack/debian/control sonic-pi-3.1.0~repack~test-1/debian/control
--- sonic-pi-2.10.0~repack/debian/control 2018-01-04 11:57:16.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/control 2019-06-27 13:05:38.753376257 +0100
@@ -26,7 +26,12 @@
ruby-multi-json,
ruby-rugged,
ruby-wavefile (>= 0.6.0-2),
- ruby-all-dev
+ ruby-all-dev,
+ ruby-ffi,
+ libaubio5,
+ libqwt-qt5-dev,
+ libqt5svg5-dev,
+ libboost-dev
Standards-Version: 3.9.8
Homepage: http://sonic-pi.net/
Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/sonic-pi.git
@@ -59,7 +64,10 @@
sonic-pi-samples (= ${source:Version}),
supercollider-server,
sc3-plugins-server,
- jackd
+ jackd,
+ ruby-ffi,
+ libaubio5,
+ ruby-memoist
Suggests:
sonic-pi-server-doc
Description: Backend server for Sonic Pi
Only in sonic-pi-3.1.0~repack~test-1/debian/: .debhelper
Only in sonic-pi-3.1.0~repack~test-1/debian/: files
diff -ur sonic-pi-2.10.0~repack/debian/patches/02-do-no-require-unused-ruby-gems.patch sonic-pi-3.1.0~repack~test-1/debian/patches/02-do-no-require-unused-ruby-gems.patch
--- sonic-pi-2.10.0~repack/debian/patches/02-do-no-require-unused-ruby-gems.patch 2016-04-18 10:24:14.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/02-do-no-require-unused-ruby-gems.patch 2019-06-26 23:29:33.755827669 +0100
@@ -9,15 +9,14 @@
Author: Hanno Zulla <kont...@hanno.de>
Last-Update: 2016-01-22
-Index: sonic-pi/app/server/core.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/core.rb
===================================================================
---- sonic-pi.orig/app/server/core.rb 2016-04-15 14:08:06.680091344 +0200
-+++ sonic-pi/app/server/core.rb 2016-04-15 14:08:06.680091344 +0200
-@@ -482,45 +482,6 @@
- end
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/core.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/core.rb
+@@ -710,44 +710,6 @@ class Float
end
--
+
-require 'rubame'
-
-## Teach Rubame::Server#run to block on IO.select
@@ -26,7 +25,7 @@
-
- class Server
- def run(time = 0, &blk)
-- readable, writable = IO.select(@reading, @writing)
+- readable, _ = IO.select(@reading, @writing)
-
- if readable
- readable.each do |socket|
@@ -56,6 +55,6 @@
-end
-
-
- # Backport Ruby 2+ thread local variable syntax
- if RUBY_VERSION < "2"
- class Thread
+
+ class Array
+ include SonicPi::Core::TLMixin
diff -ur sonic-pi-2.10.0~repack/debian/patches/03-use-debian-gems.patch sonic-pi-3.1.0~repack~test-1/debian/patches/03-use-debian-gems.patch
--- sonic-pi-2.10.0~repack/debian/patches/03-use-debian-gems.patch 2016-04-18 10:24:14.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/03-use-debian-gems.patch 2019-06-27 00:35:45.642940235 +0100
@@ -11,53 +11,14 @@
Author: Hanno Zulla <kont...@hanno.de>
Last-Update: 2016-01-22
-Index: sonic-pi/app/server/core.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/core.rb
===================================================================
---- sonic-pi.orig/app/server/core.rb 2016-04-15 14:12:02.998058136 +0200
-+++ sonic-pi/app/server/core.rb 2016-04-15 14:12:40.489745640 +0200
-@@ -14,53 +14,8 @@
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/core.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/core.rb
+@@ -20,14 +20,8 @@ raise "Sonic Pi requires Ruby 2+ to be i
+ require 'rbconfig'
+ ruby_api = RbConfig::CONFIG['ruby_version']
- raise "Sonic Pi requires Ruby 1.9.3+ to be installed. You are using version #{RUBY_VERSION}" if RUBY_VERSION < "1.9.3"
-
--## This core file sets up the load path and applies any necessary monkeypatches.
--
--## Ensure native lib dir is available
--require 'rbconfig'
--ruby_api = RbConfig::CONFIG['ruby_version']
--os = case RUBY_PLATFORM
-- when /.*arm.*-linux.*/
-- :raspberry
-- when /.*linux.*/
-- :linux
-- when /.*darwin.*/
-- :osx
-- when /.*mingw.*/
-- :windows
-- else
-- RUBY_PLATFORM
-- end
--ruby_gem_native_path = "#{File.expand_path("../rb-native", __FILE__)}"
--ruby_gem_api_path = "#{ruby_gem_native_path}/#{os}/#{ruby_api}"
--
--unless File.directory?(ruby_gem_api_path)
-- STDERR.puts "*** COULD NOT FIND RUBY GEMS REQUIRED BY SONIC PI ***"
-- STDERR.puts "Directory '#{ruby_gem_api_path}' not found."
-- STDERR.puts "Your ruby interpreter is '#{RbConfig.ruby}', supporting ruby api #{ruby_api}."
-- Dir.entries("#{ruby_gem_native_path}/#{os}/")
-- .select { |d| (File.directory?("#{ruby_gem_native_path}/#{os}/#{d}") && d != '.' && d != '..') }
-- .each do |installed_ruby_api|
-- STDERR.puts "The Sonic Pi on your computer was installed for ruby api #{installed_ruby_api}."
-- end
-- STDERR.puts "Please refer to the Sonic Pi install instructions."
-- STDERR.puts "For installation, you need to run 'app/server/bin/compile-extensions.rb'."
-- STDERR.puts "If you change or upgrade your ruby interpreter later, you may need to run it again."
--
-- raise "Could not access ruby gem directory"
--end
--
--$:.unshift ruby_gem_api_path
--
--require 'win32/process' if os == :windows
-
-## Ensure all libs in vendor directory are available
-Dir["#{File.expand_path("../vendor", __FILE__)}/*/lib/"].each do |vendor_lib|
diff -ur sonic-pi-2.10.0~repack/debian/patches/04-rename-ruby-beautify-legacy.patch sonic-pi-3.1.0~repack~test-1/debian/patches/04-rename-ruby-beautify-legacy.patch
--- sonic-pi-2.10.0~repack/debian/patches/04-rename-ruby-beautify-legacy.patch 2016-04-18 10:24:14.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/04-rename-ruby-beautify-legacy.patch 2019-06-27 01:47:08.437616393 +0100
@@ -12,10 +12,10 @@
Author: Hanno Zulla <kont...@hanno.de>
Last-Update: 2016-02-04
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb 2016-04-15 14:13:35.097294436 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify.rb
@@ -1,26 +1,26 @@
-require "ruby-beautify/version"
-require 'ruby-beautify/block_start'
@@ -55,27 +55,27 @@
end
-end # module RBeautify
+end # module RBeautifyLegacy
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb 2016-04-15 14:13:35.097294436 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class BlockEnd
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb 2016-04-15 14:13:35.097294436 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class BlockMatcher
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ module RBeautify
def parse_block_start(string, parent_block, offset, line_number)
if !string.empty? && (match = starts.match(string))
@@ -84,17 +84,17 @@
end
end
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb 2016-04-15 14:13:35.097294436 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class BlockStart
-@@ -105,11 +105,11 @@
+@@ -105,11 +105,11 @@ module RBeautify
# the match then this match should be skipped
return parse_explicit_block_end(match.post_match, offset + escape_chars[0].size + match[0].length)
else
@@ -108,10 +108,10 @@
end
end
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb 2016-04-15 14:13:35.097294436 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
@@ -1,8 +1,8 @@
# define ruby language
@@ -123,49 +123,49 @@
pre_keyword_boundary = '(^|[^a-z0-9A-Z:._])' # like \b but with : , . _ all added to list of exceptions
start_statement_boundary = '(^|(;|=)\s*)'
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/language.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb 2016-04-15 14:13:35.101294404 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/language.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/language.rb
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class Language
@@languages = {}
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/line.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb 2016-04-15 14:13:35.101294404 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/line.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/line.rb
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class Line
attr_reader :language, :content, :line_number, :original_block, :block, :indent_character
-Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/version.rb
===================================================================
---- sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb 2016-04-15 14:13:35.101294404 +0200
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/version.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify/version.rb
@@ -1,3 +1,3 @@
-module RBeautify
+module RBeautifyLegacy
VERSION = "0.92.2"
end
-Index: sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/lib/sonicpi/runtime.rb
===================================================================
---- sonic-pi.orig/app/server/sonicpi/lib/sonicpi/runtime.rb 2016-04-15 14:13:35.101294404 +0200
-+++ sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb 2016-04-15 14:13:35.101294404 +0200
-@@ -36,7 +36,7 @@
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/lib/sonicpi/runtime.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/lib/sonicpi/runtime.rb
+@@ -37,7 +37,7 @@ require 'uri'
require 'thread'
require 'fileutils'
require 'set'
-require 'ruby-beautify'
-+require_relative '../../../vendor/ruby-beautify/lib/ruby-beautify-legacy'
++require_relative '../../vendor/ruby-beautify/lib/ruby-beautify-legacy'
require 'securerandom'
require 'active_support/core_ext/integer/inflections'
-@@ -919,7 +919,7 @@
+@@ -1215,7 +1215,7 @@ module SonicPi
end
def beautify_ruby_source(source)
source = source << "\n" unless source.end_with? "\n"
@@ -173,4 +173,4 @@
+ RBeautifyLegacy.beautify_string :ruby, source
end
-
+ def normalise_buffer_name(name)
diff -ur sonic-pi-2.10.0~repack/debian/patches/05-doc-base-index.patch sonic-pi-3.1.0~repack~test-1/debian/patches/05-doc-base-index.patch
--- sonic-pi-2.10.0~repack/debian/patches/05-doc-base-index.patch 2016-04-18 10:24:14.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/05-doc-base-index.patch 2019-06-27 00:01:30.704385343 +0100
@@ -7,8 +7,8 @@
Index: sonic-pi/app/server/bin/qt-doc.rb
===================================================================
---- sonic-pi.orig/app/server/bin/qt-doc.rb 2016-04-15 14:13:46.033204604 +0200
-+++ sonic-pi/app/server/bin/qt-doc.rb 2016-04-15 14:13:46.033204604 +0200
+--- sonic-pi.orig/app/server/ruby/bin/qt-doc.rb 2016-04-15 14:13:46.033204604 +0200
++++ sonic-pi/app/server/ruby/bin/qt-doc.rb 2016-04-15 14:13:46.033204604 +0200
@@ -39,6 +39,7 @@
docs = []
diff -ur sonic-pi-2.10.0~repack/debian/patches/07-examples-path.patch sonic-pi-3.1.0~repack~test-1/debian/patches/07-examples-path.patch
--- sonic-pi-2.10.0~repack/debian/patches/07-examples-path.patch 2016-05-17 12:43:40.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/07-examples-path.patch 2019-06-27 01:54:43.835558277 +0100
@@ -7,18 +7,16 @@
Author: Hanno Zulla <kont...@hanno.de>
Last-Update: 2016-05-17
-Index: sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb
+Index: sonic-pi-3.1.0~repack~test-1/app/server/ruby/lib/sonicpi/util.rb
===================================================================
---- sonic-pi.orig/app/server/sonicpi/lib/sonicpi/util.rb 2016-05-17 10:39:11.043342370 +0200
-+++ sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb 2016-05-17 10:41:41.361916610 +0200
-@@ -265,7 +265,9 @@
+--- sonic-pi-3.1.0~repack~test-1.orig/app/server/ruby/lib/sonicpi/util.rb
++++ sonic-pi-3.1.0~repack~test-1/app/server/ruby/lib/sonicpi/util.rb
+@@ -268,7 +268,7 @@ module SonicPi
end
def examples_path
- File.absolute_path("#{etc_path}/examples")
-+ linux_fhs? ?
-+ File.absolute_path("/usr/share/sonic-pi/examples") :
-+ File.absolute_path("#{etc_path}/examples")
++ File.absolute_path("/usr/share/sonic-pi/examples")
end
def server_path
Only in sonic-pi-3.1.0~repack~test-1/debian/patches: disable-two-ring-tests
Only in sonic-pi-3.1.0~repack~test-1/debian/patches: explicitly-use-some-vendor-libs.patch
diff -ur sonic-pi-2.10.0~repack/debian/patches/qsci_rename.patch sonic-pi-3.1.0~repack~test-1/debian/patches/qsci_rename.patch
--- sonic-pi-2.10.0~repack/debian/patches/qsci_rename.patch 2018-01-04 11:57:16.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/qsci_rename.patch 2019-06-27 00:11:35.543113399 +0100
@@ -1,14 +1,13 @@
---- sonic-pi-2.10.0~repack.orig/app/gui/qt/SonicPi.pro
-+++ sonic-pi-2.10.0~repack/app/gui/qt/SonicPi.pro
-@@ -34,9 +34,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+Index: sonic-pi-3.1.0~repack~test-1/app/gui/qt/SonicPi.pro
+===================================================================
+--- sonic-pi-3.1.0~repack~test-1.orig/app/gui/qt/SonicPi.pro
++++ sonic-pi-3.1.0~repack~test-1/app/gui/qt/SonicPi.pro
+@@ -20,7 +20,7 @@ QT += core gui concurrent network opengl
+
# Linux only
unix:!macx {
- lessThan(QT_MAJOR_VERSION, 5) {
-- LIBS += -lqscintilla2
-+ LIBS += -lqscintilla2_qt4
- } else {
-- LIBS += -lqt5scintilla2
-+ LIBS += -lqscintilla2_qt5
- }
- QMAKE_CXXFLAGS += -Wall -Werror -Wextra
- }
+- LIBS += -lrt -lqt5scintilla2
++ LIBS += -lrt -lqscintilla2_qt5
+ QMAKE_CXXFLAGS += -std=gnu++11
+ QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wno-unused-variable -Wno-unused-parameter
+ debug {
Only in sonic-pi-3.1.0~repack~test-1/debian/patches: revert-upstream-fhs-support-removal.patch
diff -ur sonic-pi-2.10.0~repack/debian/patches/series sonic-pi-3.1.0~repack~test-1/debian/patches/series
--- sonic-pi-2.10.0~repack/debian/patches/series 2018-01-04 11:57:16.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/patches/series 2019-06-27 10:13:55.736744902 +0100
@@ -1,8 +1,11 @@
-01-remove-rpi-volume.patch
+#01-remove-rpi-volume.patch
02-do-no-require-unused-ruby-gems.patch
03-use-debian-gems.patch
04-rename-ruby-beautify-legacy.patch
05-doc-base-index.patch
-06-paths.patch
+#06-paths.patch
07-examples-path.patch
qsci_rename.patch
+explicitly-use-some-vendor-libs.patch
+disable-two-ring-tests
+revert-upstream-fhs-support-removal.patch
diff -ur sonic-pi-2.10.0~repack/debian/rules sonic-pi-3.1.0~repack~test-1/debian/rules
--- sonic-pi-2.10.0~repack/debian/rules 2016-02-12 14:43:09.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/rules 2019-06-27 02:11:45.709471363 +0100
@@ -12,21 +12,21 @@
# This is based on upstream's Raspbian builder script app/gui/qt/rp-build-app
override_dh_auto_configure:
- chmod 755 app/server/bin/sonic-pi-server.rb
- cd app/server/vendor/ruby-beautify/lib && \
+ chmod 755 app/server/ruby/bin/sonic-pi-server.rb
+ cd app/server/ruby/vendor/ruby-beautify/lib && \
cp ruby-beautify.rb ruby-beautify-legacy.rb && \
cp -r ruby-beautify ruby-beautify-legacy && \
chmod 644 ruby-beautify-legacy.rb ruby-beautify-legacy/*.rb ruby-beautify-legacy/config/*.rb
cd app/gui/qt && \
cp -f ruby_help.tmpl ruby_help.h && \
- ../../server/bin/qt-doc.rb -o ruby_help.h
+ ../../server/ruby/bin/qt-doc.rb -o ruby_help.h
cd app/gui/qt && \
lrelease SonicPi.pro
dh_auto_configure
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- cd app/server/sonicpi/test ; \
+ cd app/server/ruby/test ; \
ruby -e 'require "ruby_debian_dev"; include RubyDebianDev; SUPPORTED_RUBY_VERSIONS.each { |v, b| system("#{b} /usr/bin/rake test") or raise "test failed for #{v}" }'
dh_auto_test
endif
@@ -36,8 +36,8 @@
make -C app/gui/qt/Makefile clean; \
fi ;
rm -rf \
- app/server/vendor/ruby-beautify/lib/ruby-beautify-legacy.rb \
- app/server/vendor/ruby-beautify/lib/ruby-beautify-legacy \
+ app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify-legacy.rb \
+ app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify-legacy \
app/gui/qt/sonic-pi \
app/gui/qt/Makefile \
app/gui/qt/ruby_help.h \
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi.debhelper.log
diff -ur sonic-pi-2.10.0~repack/debian/sonic-pi.install sonic-pi-3.1.0~repack~test-1/debian/sonic-pi.install
--- sonic-pi-2.10.0~repack/debian/sonic-pi.install 2016-02-12 14:43:09.000000000 +0000
+++ sonic-pi-3.1.0~repack~test-1/debian/sonic-pi.install 2019-06-27 19:19:57.021078986 +0100
@@ -1,3 +1,4 @@
app/gui/qt/sonic-pi usr/bin/
debian/extra/sonic-pi.png usr/share/pixmaps/
debian/extra/sonic-pi.desktop usr/share/applications/
+app/gui/qt/theme usr/lib/sonic-pi/app/gui/qt/
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-samples
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-samples.debhelper.log
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-samples.substvars
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server.debhelper.log
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server-doc
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server-doc.debhelper.log
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server-doc.substvars
diff -ur sonic-pi-2.10.0~repack/debian/sonic-pi-server.install sonic-pi-3.1.0~repack~test-1/debian/sonic-pi-server.install
--- sonic-pi-2.10.0~repack/debian/sonic-pi-server.install 2016-05-17 12:43:40.000000000 +0100
+++ sonic-pi-3.1.0~repack~test-1/debian/sonic-pi-server.install 2019-06-27 13:16:04.694723202 +0100
@@ -1,8 +1,12 @@
-app/server/core.rb usr/lib/sonic-pi/server
-app/server/bin/sonic-pi-server.rb usr/lib/sonic-pi/server/bin
-app/server/sonicpi/lib usr/lib/sonic-pi/server/sonicpi
-app/server/vendor/ruby-beautify/lib/ruby-beautify-legacy.rb usr/lib/sonic-pi/server/vendor/ruby-beautify/lib/
-app/server/vendor/ruby-beautify/lib/ruby-beautify-legacy usr/lib/sonic-pi/server/vendor/ruby-beautify/lib/
+app/server/ruby/core.rb usr/lib/sonic-pi/server
+app/server/ruby/bin/* usr/lib/sonic-pi/server/bin
+app/server/ruby/lib usr/lib/sonic-pi/server/
+app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify-legacy.rb usr/lib/sonic-pi/server/vendor/ruby-beautify/lib/
+app/server/ruby/vendor/ruby-beautify/lib/ruby-beautify-legacy usr/lib/sonic-pi/server/vendor/ruby-beautify/lib/
+app/server/ruby/vendor/fast_osc-0.0.12/lib/fast_osc.rb usr/lib/sonic-pi/server/vendor/fast_osc-0.0.12/lib/
+app/server/ruby/vendor/fast_osc-0.0.12/lib/fast_osc usr/lib/sonic-pi/server/vendor/fast_osc-0.0.12/lib/
+app/server/ruby/vendor/ruby-aubio-prerelease/lib/aubio usr/lib/sonic-pi/server/vendor/ruby-aubio-prerelease/lib/
+app/server/ruby/vendor/ruby-aubio-prerelease/lib/aubio.rb usr/lib/sonic-pi/server/vendor/ruby-aubio-prerelease/lib/
etc/synthdefs/compiled usr/share/sonic-pi/synthdefs
etc/snippets usr/share/sonic-pi
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi-server.substvars
Only in sonic-pi-3.1.0~repack~test-1/debian/: sonic-pi.substvars
