[SCM] sonic-pi/master: Remove patches that have been accepted upstream.
hanno-guest at users.alioth.debian.org
hanno-guest at users.alioth.debian.org
Fri Apr 15 13:27:01 UTC 2016
The following commit has been merged in the master branch:
commit 0b0260350c3cd18006336550f1c0fca624d4d1df
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date: Fri Apr 15 15:18:58 2016 +0200
Remove patches that have been accepted upstream.
diff --git a/debian/patches/01-qt5scintilla.patch b/debian/patches/01-qt5scintilla.patch
deleted file mode 100644
index 6b5b10f..0000000
--- a/debian/patches/01-qt5scintilla.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: use Qt5 QScintilla to build Sonic Pi GUI
- Upstream builds binaries of Sonic Pi with different settings, using
- Qt5 for Windows and OS X, Qt4 for Raspbian. This patch modifies the
- settings to use Qt5 (and the Qt5 QScintilla library) for building the
- binary. A modified version of this patch was sent upstream and has
- since been accepted to be included in a future release.
-Forwarded: yes
-Author: Hanno Zulla <kontakt at hanno.de>
-Last-Update: 2016-01-11
-
-Index: pkg-sonic-pi/app/gui/qt/SonicPi.pro
-===================================================================
---- pkg-sonic-pi.orig/app/gui/qt/SonicPi.pro 2016-01-11 14:55:26.485843387 +0100
-+++ pkg-sonic-pi/app/gui/qt/SonicPi.pro 2016-01-11 14:55:26.481843422 +0100
-@@ -19,7 +19,7 @@
-
- # -- Change to match the location of QScintilla on your system
- #
-- LIBS += -L/Users/sam/Downloads/tmp/QScintilla-gpl-2.9/Qt4Qt5 -lqscintilla2
-+ LIBS += -L/Users/sam/Downloads/tmp/QScintilla-gpl-2.9/Qt4Qt5 -lqt5scintilla2
- INCLUDEPATH += /Users/sam/Downloads/tmp/QScintilla-gpl-2.9/Qt4Qt5
- DEPENDPATH += /Users/sam/Downloads/tmp/QScintilla-gpl-2.9/Qt4Qt5
- # --
-@@ -108,7 +108,7 @@
- RC_FILE = SonicPi.rc
-
- ICON = images/app.icns
--LIBS += -lqscintilla2
-+LIBS += -lqt5scintilla2
-
- win32 {
- install_qsci.files = $$[QT_INSTALL_LIBS]\qscintilla2.dll
diff --git a/debian/patches/03-remove-rpi-volume.patch b/debian/patches/01-remove-rpi-volume.patch
similarity index 100%
rename from debian/patches/03-remove-rpi-volume.patch
rename to debian/patches/01-remove-rpi-volume.patch
diff --git a/debian/patches/04-do-no-require-unused-ruby-gems.patch b/debian/patches/02-do-no-require-unused-ruby-gems.patch
similarity index 100%
rename from debian/patches/04-do-no-require-unused-ruby-gems.patch
rename to debian/patches/02-do-no-require-unused-ruby-gems.patch
diff --git a/debian/patches/02-paths.patch b/debian/patches/02-paths.patch
deleted file mode 100644
index 1bf41a7..0000000
--- a/debian/patches/02-paths.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-Description: use fhs directory scheme
- Upstream expects to install Sonic Pi in a single directory
- (e.g. /opt/sonic-pi) and then uses a relative directory scheme to find
- binaries, libraries and assets in there. This patch modifies the path
- settings to follow the fhs guidelines. A modified version of this patch
- was sent upstream and has since been accepted to in be included in a
- future release.
- <URL: https://github.com/samaaron/sonic-pi/pull/916>
-Forwarded: yes
-Author: Hanno Zulla <kontakt at hanno.de>
-Last-Update: 2016-01-11
-
-Index: pkg-sonic-pi/app/gui/qt/mainwindow.cpp
-===================================================================
---- pkg-sonic-pi.orig/app/gui/qt/mainwindow.cpp 2016-01-11 14:57:34.012741792 +0100
-+++ pkg-sonic-pi/app/gui/qt/mainwindow.cpp 2016-01-11 14:57:33.984742032 +0100
-@@ -676,29 +676,44 @@
-
-
- serverProcess = new QProcess();
-+ QString prg_path, prg_arg;
-
-- QString root = rootPath();
-+ if (QCoreApplication::applicationDirPath().startsWith("/usr/bin")) {
-
-- #if defined(Q_OS_WIN)
-- QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #elif defined(Q_OS_MAC)
-- QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
-- QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #else
-- //assuming Raspberry Pi
-- QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
-- QFile file(prg_path);
-- if(!file.exists()) {
-- // use system ruby if bundled ruby doesn't exist
-+ // Sonic Pi is installed on desktop Linux from a binary package
- prg_path = "/usr/bin/ruby";
-- }
-+ prg_arg = "/usr/lib/sonic-pi/server/bin/sonic-pi-server.rb";
-+ sample_path = "/usr/share/sonic-pi/samples";
-+
-+ } else {
-+
-+ // Sonic Pi is running in the user's local dir or
-+ // is installed on Win/Mac/RPi
-+
-+ QString root = rootPath();
-+
-+ #if defined(Q_OS_WIN)
-+ QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
-+ QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-+ sample_path = root + "/etc/samples";
-+ #elif defined(Q_OS_MAC)
-+ QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
-+ QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
-+ sample_path = root + "/etc/samples";
-+ #else
-+ //assuming Raspberry Pi
-+ QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
-+ QFile file(prg_path);
-+ if(!file.exists()) {
-+ // use system ruby if bundled ruby doesn't exist
-+ prg_path = "/usr/bin/ruby";
-+ }
-+
-+ prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-+ sample_path = root + "/etc/samples";
-+ #endif
-
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #endif
-+ }
-
- prg_path = QDir::toNativeSeparators(prg_path);
- prg_arg = QDir::toNativeSeparators(prg_arg);
-@@ -712,7 +727,6 @@
- }
-
-
--
- // std::cout << "[GUI] - exec "<< prg_path.toStdString() << " " << prg_arg.toStdString() << std::endl;
-
- std::cout << "[GUI] - booting live coding server" << std::endl;
-Index: pkg-sonic-pi/app/server/core.rb
-===================================================================
---- pkg-sonic-pi.orig/app/server/core.rb 2016-01-11 14:57:34.012741792 +0100
-+++ pkg-sonic-pi/app/server/core.rb 2016-01-11 14:57:33.984742032 +0100
-@@ -53,7 +53,8 @@
- 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_path = File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ? "/usr/share/sonic-pi" : "../../../etc"
-+ @@random_numbers = ::WaveFile::Reader.new(File.expand_path("#{random_numbers_path}/buffers/rand-stream.wav", __FILE__), ::WaveFile::Format.new(:mono, :float, 44100)).read(441000).samples.freeze
-
- def self.to_a
- @@random_numbers
-Index: pkg-sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb
-===================================================================
---- pkg-sonic-pi.orig/app/server/sonicpi/lib/sonicpi/util.rb 2016-01-11 14:57:34.012741792 +0100
-+++ pkg-sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb 2016-01-11 14:57:33.984742032 +0100
-@@ -169,7 +169,9 @@
- end
-
- def snippets_path
-- File.absolute_path("#{etc_path}/snippets")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/share/sonic-pi/snippets") :
-+ File.absolute_path("#{etc_path}/snippets")
- end
-
- def doc_path
-@@ -189,15 +191,21 @@
- end
-
- def synthdef_path
-- File.absolute_path("#{etc_path}/synthdefs/compiled")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/share/sonic-pi/synthdefs/compiled") :
-+ File.absolute_path("#{etc_path}/synthdefs/compiled")
- end
-
- def samples_path
-- File.absolute_path("#{etc_path}/samples")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/share/sonic-pi/samples") :
-+ File.absolute_path("#{etc_path}/samples")
- end
-
- def buffers_path
-- File.absolute_path("#{etc_path}/buffers")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/share/sonic-pi/buffers") :
-+ File.absolute_path("#{etc_path}/buffers")
- end
-
- def app_path
-Index: pkg-sonic-pi/app/server/util.rb
-===================================================================
---- pkg-sonic-pi.orig/app/server/util.rb 2016-01-11 14:57:34.012741792 +0100
-+++ pkg-sonic-pi/app/server/util.rb 2016-01-11 14:57:34.008741826 +0100
-@@ -16,11 +16,15 @@
- end
-
- def sp_scripts_path()
-- File.absolute_path("#{sp_sonic_pi_path}/app/scripts")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/lib/sonic-pi/scripts") :
-+ File.absolute_path("#{sp_sonic_pi_path}/app/scripts")
- end
-
- def sp_synthdefs_path()
-- File.absolute_path("#{sp_sonic_pi_path}/app/etc/synthdefs/compiled")
-+ File.dirname(__FILE__).start_with?("/usr/lib/sonic-pi") ?
-+ File.absolute_path("/usr/share/sonic-pi/synthdefs/compiled") :
-+ File.absolute_path("#{sp_sonic_pi_path}/app/etc/synthdefs/compiled")
- end
-
- def spider_log(message)
diff --git a/debian/patches/05-use-debian-gems.patch b/debian/patches/03-use-debian-gems.patch
similarity index 100%
rename from debian/patches/05-use-debian-gems.patch
rename to debian/patches/03-use-debian-gems.patch
diff --git a/debian/patches/06-rename-ruby-beautify-legacy.patch b/debian/patches/04-rename-ruby-beautify-legacy.patch
similarity index 100%
rename from debian/patches/06-rename-ruby-beautify-legacy.patch
rename to debian/patches/04-rename-ruby-beautify-legacy.patch
diff --git a/debian/patches/07-doc-base-index.patch b/debian/patches/05-doc-base-index.patch
similarity index 100%
rename from debian/patches/07-doc-base-index.patch
rename to debian/patches/05-doc-base-index.patch
diff --git a/debian/patches/series b/debian/patches/series
index 4720a89..1bfe860 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-01-qt5scintilla.patch
-02-paths.patch
-03-remove-rpi-volume.patch
-04-do-no-require-unused-ruby-gems.patch
-05-use-debian-gems.patch
-06-rename-ruby-beautify-legacy.patch
-07-doc-base-index.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
--
sonic-pi packaging
More information about the pkg-multimedia-commits
mailing list