[SCM] sonic-pi/master: Refresh patches to current release.
hanno-guest at users.alioth.debian.org
hanno-guest at users.alioth.debian.org
Fri Apr 15 12:24:20 UTC 2016
The following commit has been merged in the master branch:
commit c4c75c3b0b964351075945a1619e6ea5a5f488b4
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date: Fri Apr 15 14:14:04 2016 +0200
Refresh patches to current release.
diff --git a/debian/patches/01-remove-rpi-volume.patch b/debian/patches/01-remove-rpi-volume.patch
index 9c02128..5878202 100644
--- a/debian/patches/01-remove-rpi-volume.patch
+++ b/debian/patches/01-remove-rpi-volume.patch
@@ -10,30 +10,23 @@ Forwarded: yes
Author: Hanno Zulla <kontakt at hanno.de>
Last-Update: 2016-01-11
-Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
+Index: sonic-pi/app/gui/qt/mainwindow.cpp
===================================================================
---- pkg-sonic-pi.orig/app/gui/qt/mainwindow.cpp 2016-01-11 15:00:35.171184925 +0100
-+++ pkg-sonic-pi/app/gui/qt/mainwindow.cpp 2016-01-11 15:00:35.147185131 +0100
-@@ -119,6 +119,10 @@
- }
-
+--- sonic-pi.orig/app/gui/qt/mainwindow.cpp 2016-04-15 13:58:18.626029441 +0200
++++ sonic-pi/app/gui/qt/mainwindow.cpp 2016-04-15 14:05:33.605485960 +0200
+@@ -174,6 +174,11 @@
+ latest_version_num = 0;
+ this->splash = splash;
this->i18n = i18n;
+
-+#if defined(Q_OS_LINUX)
-+ this->raspberryPiSoundcard = isRaspberryPiSoundcard();
-+#endif
-
- printAsciiArtLogo();
-
-@@ -727,6 +731,7 @@
- }
-
-
++ #if defined(Q_OS_LINUX)
++ this->raspberryPiSoundcard = isRaspberryPiSoundcard();
++ #endif
+
- // std::cout << "[GUI] - exec "<< prg_path.toStdString() << " " << prg_arg.toStdString() << std::endl;
-
- std::cout << "[GUI] - booting live coding server" << std::endl;
-@@ -817,9 +822,44 @@
+ guiID = QUuid::createUuid().toString();
+ QSettings settings("uk.ac.cam.cl", "Sonic Pi");
+ defaultTextBrowserStyle = "QTextBrowser { selection-color: white; selection-background-color: deeppink; padding-left:10; padding-top:10; padding-bottom:10; padding-right:10 ; background:white;}";
+@@ -912,9 +917,44 @@
tabs->setTabPosition(QTabWidget::South);
QGridLayout *grid = new QGridLayout;
@@ -81,7 +74,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
QGroupBox *advancedAudioBox = new QGroupBox(tr("Advanced Audio"));
advancedAudioBox->setToolTip(tr("Advanced audio settings for working with\nexternal PA systems when performing with Sonic Pi."));
-@@ -843,30 +883,6 @@
+@@ -935,30 +975,6 @@
advancedAudioBox->setLayout(advanced_audio_box_layout);
@@ -112,7 +105,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
QGroupBox *debug_box = new QGroupBox(tr("Logging"));
debug_box->setToolTip(tr("Configure debug behaviour"));
-@@ -984,17 +1000,7 @@
+@@ -1101,16 +1117,6 @@
editor_box->setLayout(gridEditorPrefs);
grid->addWidget(prefTabs, 0, 0);
@@ -126,12 +119,10 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
- prefTabs->addTab(audio_prefs_box, tr("Audio"));
-#endif
-
-- QGroupBox *studio_prefs_box = new QGroupBox();
-+ QGroupBox *studio_prefs_box = new QGroupBox();
+ QGroupBox *studio_prefs_box = new QGroupBox();
QGridLayout *studio_prefs_box_layout = new QGridLayout;
- studio_prefs_box_layout->addWidget(advancedAudioBox, 0, 0);
-@@ -1064,9 +1070,25 @@
+@@ -1184,9 +1190,25 @@
mixer_force_mono->setChecked(settings.value("prefs/mixer-force-mono", false).toBool());
mixer_invert_stereo->setChecked(settings.value("prefs/mixer-invert-stereo", false).toBool());
@@ -160,7 +151,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
check_updates->setChecked(settings.value("prefs/rp/check-updates", true).toBool());
-@@ -1074,26 +1096,10 @@
+@@ -1194,27 +1216,11 @@
gui_transparency_slider->setValue(settings.value("prefs/gui_transparency", 0).toInt());
@@ -172,6 +163,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
update_mixer_force_mono();
- changeRPSystemVol(stored_vol);
update_check_updates();
+ updateLogAutoScroll();
-
- if(settings.value("prefs/rp/force-audio-default", true).toBool()) {
- setRPSystemAudioAuto();
@@ -186,8 +178,8 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
-
}
- void MainWindow::invokeStartupError(QString msg) {
-@@ -1529,31 +1535,6 @@
+ void MainWindow::setMessageBoxStyle() {
+@@ -1709,31 +1715,6 @@
}
@@ -219,7 +211,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
void MainWindow::toggleDarkMode() {
dark_mode->toggle();
updateDarkMode();
-@@ -1761,51 +1742,54 @@
+@@ -1951,51 +1932,54 @@
}
}
@@ -293,16 +285,14 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
void MainWindow::showPrefsPane()
{
-@@ -2177,11 +2161,15 @@
- settings.setValue("prefs/dark-mode", dark_mode->isChecked());
- settings.setValue("prefs/mixer-force-mono", mixer_force_mono->isChecked());
+@@ -2381,10 +2365,14 @@
settings.setValue("prefs/mixer-invert-stereo", mixer_invert_stereo->isChecked());
--
+ settings.setValue("prefs/", mixer_invert_stereo->isChecked());
+
- settings.setValue("prefs/rp/force-audio-default", rp_force_audio_default->isChecked());
- settings.setValue("prefs/rp/force-audio-headphones", rp_force_audio_headphones->isChecked());
- settings.setValue("prefs/rp/force-audio-hdmi", rp_force_audio_hdmi->isChecked());
- settings.setValue("prefs/rp/system-vol", rp_system_vol->value());
-+
+#if defined(Q_OS_LINUX)
+ if (raspberryPiSoundcard) {
+ settings.setValue("prefs/rp/force-audio-default", rp_force_audio_default->isChecked());
@@ -314,11 +304,11 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
settings.setValue("prefs/rp/check-updates", check_updates->isChecked());
settings.setValue("prefs/auto-indent-on-run", auto_indent_on_run->isChecked());
-Index: pkg-sonic-pi/app/gui/qt/mainwindow.h
+Index: sonic-pi/app/gui/qt/mainwindow.h
===================================================================
---- pkg-sonic-pi.orig/app/gui/qt/mainwindow.h 2016-01-11 15:00:35.171184925 +0100
-+++ pkg-sonic-pi/app/gui/qt/mainwindow.h 2016-01-11 15:00:35.171184925 +0100
-@@ -123,11 +123,7 @@
+--- sonic-pi.orig/app/gui/qt/mainwindow.h 2016-04-15 13:58:18.626029441 +0200
++++ sonic-pi/app/gui/qt/mainwindow.h 2016-04-15 13:58:18.610029632 +0200
+@@ -129,11 +129,7 @@
void onExitCleanup();
void toggleRecording();
void toggleRecordingOnIcon();
@@ -330,7 +320,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.h
void changeShowLineNumbers();
void toggleDarkMode();
void updateDarkMode();
-@@ -225,6 +221,17 @@
+@@ -238,6 +234,17 @@
#endif
bool i18n;
@@ -348,7 +338,7 @@ Index: pkg-sonic-pi/app/gui/qt/mainwindow.h
static const int workspace_max = 10;
SonicPiScintilla *workspaces[workspace_max];
QWidget *prefsCentral;
-@@ -274,7 +281,6 @@
+@@ -291,7 +298,6 @@
QRadioButton *rp_force_audio_hdmi;
QRadioButton *rp_force_audio_default;
QRadioButton *rp_force_audio_headphones;
diff --git a/debian/patches/02-do-no-require-unused-ruby-gems.patch b/debian/patches/02-do-no-require-unused-ruby-gems.patch
index 513a21c..9db1f7a 100644
--- a/debian/patches/02-do-no-require-unused-ruby-gems.patch
+++ b/debian/patches/02-do-no-require-unused-ruby-gems.patch
@@ -9,11 +9,11 @@ Forwarded: no
Author: Hanno Zulla <kontakt at hanno.de>
Last-Update: 2016-01-22
-Index: pkg-sonic-pi.work/app/server/core.rb
+Index: sonic-pi/app/server/core.rb
===================================================================
---- pkg-sonic-pi.work.orig/app/server/core.rb 2016-01-22 15:49:32.789327374 +0100
-+++ pkg-sonic-pi.work/app/server/core.rb 2016-01-22 15:49:59.161112167 +0100
-@@ -378,45 +378,6 @@
+--- 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
end
diff --git a/debian/patches/03-use-debian-gems.patch b/debian/patches/03-use-debian-gems.patch
index 768467e..57ecbad 100644
--- a/debian/patches/03-use-debian-gems.patch
+++ b/debian/patches/03-use-debian-gems.patch
@@ -13,9 +13,9 @@ Last-Update: 2016-01-22
Index: sonic-pi/app/server/core.rb
===================================================================
---- sonic-pi.orig/app/server/core.rb 2016-02-26 15:53:36.410295019 +0100
-+++ sonic-pi/app/server/core.rb 2016-02-26 15:54:38.632757162 +0100
-@@ -14,34 +14,8 @@
+--- 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 @@
raise "Sonic Pi requires Ruby 1.9.3+ to be installed. You are using version #{RUBY_VERSION}" if RUBY_VERSION < "1.9.3"
@@ -36,7 +36,26 @@ Index: sonic-pi/app/server/core.rb
- else
- RUBY_PLATFORM
- end
--$:.unshift "#{File.expand_path("../rb-native", __FILE__)}/#{os}/#{ruby_api}/"
+-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
-
diff --git a/debian/patches/04-rename-ruby-beautify-legacy.patch b/debian/patches/04-rename-ruby-beautify-legacy.patch
index 2b233f2..80e9adc 100644
--- a/debian/patches/04-rename-ruby-beautify-legacy.patch
+++ b/debian/patches/04-rename-ruby-beautify-legacy.patch
@@ -12,10 +12,10 @@ Forwarded: no
Author: Hanno Zulla <kontakt at hanno.de>
Last-Update: 2016-02-04
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb 2016-02-03 17:32:11.051445795 +0100
+--- 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
@@ -1,26 +1,26 @@
-require "ruby-beautify/version"
-require 'ruby-beautify/block_start'
@@ -55,20 +55,20 @@ Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify.rb
end
-end # module RBeautify
+end # module RBeautifyLegacy
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_end.rb 2016-02-03 14:27:55.205161507 +0100
+--- 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
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class BlockEnd
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matcher.rb 2016-02-03 14:28:05.525075950 +0100
+--- 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
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
@@ -84,10 +84,10 @@ Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_matc
end
end
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_start.rb 2016-02-03 14:28:13.333011608 +0100
+--- 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
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
@@ -108,10 +108,10 @@ Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/block_star
end
end
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/ruby.rb 2016-02-03 14:29:11.724540127 +0100
+--- 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
@@ -1,8 +1,8 @@
# define ruby language
@@ -123,39 +123,39 @@ Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/config/rub
pre_keyword_boundary = '(^|[^a-z0-9A-Z:._])' # like \b but with : , . _ all added to list of exceptions
start_statement_boundary = '(^|(;|=)\s*)'
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/language.rb 2016-02-03 14:28:19.648959801 +0100
+--- 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
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class Language
@@languages = {}
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/line.rb 2016-02-03 14:28:25.796909571 +0100
+--- 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
@@ -1,4 +1,4 @@
-module RBeautify
+module RBeautifyLegacy
class Line
attr_reader :language, :content, :line_number, :original_block, :block, :indent_character
-Index: pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb
+Index: sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb 2016-02-03 14:17:26.287100863 +0100
-+++ pkg-sonic-pi/app/server/vendor/ruby-beautify/lib/ruby-beautify/version.rb 2016-02-03 14:28:34.972834958 +0100
+--- 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
@@ -1,3 +1,3 @@
-module RBeautify
+module RBeautifyLegacy
VERSION = "0.92.2"
end
-Index: pkg-sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb
+Index: sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/sonicpi/lib/sonicpi/runtime.rb 2016-02-03 14:19:15.000000000 +0100
-+++ pkg-sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb 2016-02-03 17:30:15.280535790 +0100
+--- 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 @@
require 'thread'
require 'fileutils'
@@ -165,7 +165,7 @@ Index: pkg-sonic-pi/app/server/sonicpi/lib/sonicpi/runtime.rb
require 'securerandom'
require 'active_support/core_ext/integer/inflections'
-@@ -858,7 +858,7 @@
+@@ -919,7 +919,7 @@
end
def beautify_ruby_source(source)
source = source << "\n" unless source.end_with? "\n"
diff --git a/debian/patches/05-doc-base-index.patch b/debian/patches/05-doc-base-index.patch
index 15b4572..3366645 100644
--- a/debian/patches/05-doc-base-index.patch
+++ b/debian/patches/05-doc-base-index.patch
@@ -5,10 +5,10 @@ Forwarded: no
Author: Hanno Zulla <kontakt at hanno.de>
Last-Update: 2016-02-11
-Index: pkg-sonic-pi/app/server/bin/qt-doc.rb
+Index: sonic-pi/app/server/bin/qt-doc.rb
===================================================================
---- pkg-sonic-pi.orig/app/server/bin/qt-doc.rb 2016-02-11 12:07:05.882894560 +0100
-+++ pkg-sonic-pi/app/server/bin/qt-doc.rb 2016-02-11 12:14:49.622559528 +0100
+--- 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
@@ -39,6 +39,7 @@
docs = []
--
sonic-pi packaging
More information about the pkg-multimedia-commits
mailing list