[SCM] sonic-pi/master: Add new patch to fix broken FHS detection code.

hanno-guest at users.alioth.debian.org hanno-guest at users.alioth.debian.org
Fri Apr 15 14:43:40 UTC 2016


The following commit has been merged in the master branch:
commit bd2a593754cfb4bfa07ae97f069157eb809f2cf2
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Fri Apr 15 16:34:15 2016 +0200

    Add new patch to fix broken FHS detection code.

diff --git a/debian/patches/06-paths.patch b/debian/patches/06-paths.patch
new file mode 100644
index 0000000..ef2b175
--- /dev/null
+++ b/debian/patches/06-paths.patch
@@ -0,0 +1,22 @@
+Index: sonic-pi/app/gui/qt/mainwindow.cpp
+===================================================================
+--- sonic-pi.orig/app/gui/qt/mainwindow.cpp	2016-04-15 16:30:04.756592919 +0200
++++ sonic-pi/app/gui/qt/mainwindow.cpp	2016-04-15 16:31:00.355804883 +0200
+@@ -102,7 +102,7 @@
+ MainWindow::MainWindow(QApplication &app, bool i18n, QSplashScreen* splash)
+ #endif
+ {
+-  if (QCoreApplication::applicationDirPath().startsWith("/usr/bin/")) {
++  if (QCoreApplication::applicationDirPath().startsWith("/usr/bin")) {
+ 
+     // use FHS directory scheme:
+     // Sonic Pi is installed in /usr/bin from a Linux distribution's package
+@@ -111,7 +111,7 @@
+     ruby_server_path = "/usr/lib/sonic-pi/server/bin/sonic-pi-server.rb";
+     sample_path = "/usr/share/sonic-pi/samples";
+ 
+-  } else if (QCoreApplication::applicationDirPath().startsWith("/opt/")) {
++  } else if (QCoreApplication::applicationDirPath().startsWith("/opt")) {
+ 
+     // use /opt directory scheme:
+     // Sonic Pi is installed in /opt from the Raspbian .deb package
diff --git a/debian/patches/series b/debian/patches/series
index 1bfe860..831576a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-use-debian-gems.patch
 04-rename-ruby-beautify-legacy.patch
 05-doc-base-index.patch
+06-paths.patch

-- 
sonic-pi packaging



More information about the pkg-multimedia-commits mailing list