switched to build-ubuntu-apt script and resolved dependency issues

3 files changed, 106 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 16bbbec9d5cc..aa79eb3e89af 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nigel Michki <nigeil@yahoo.com>
 pkgname=sonic-pi-git
-pkgver=v2.10.0.r716.gdd1f41a
+pkgver=v2.10.0.r740.g1f1f098
 pkgrel=1
 pkgdesc="A music-centric programming environment, originally built for the raspberry pi."
 arch=('i686' 
@@ -16,7 +16,7 @@ depends=('sed'
 	 'qscintilla-qt5'
 	 'jack'
     'aubio'
-    'qwt')
+    'qwt-qt5')
 makedepends=('cmake'
 	     'git'
 	     'supercollider'
@@ -29,33 +29,47 @@ optdepends=('qjackctl: for graphical jackd spawning/configuration'
 source=('sonic-pi::git+https://github.com/samaaron/sonic-pi.git'
 	     'launcher.sh'
         'sonic-pi-git.png'
-        'sonic-pi-git.desktop')
+        'sonic-pi-git.desktop'
+        'build-ubuntu-app.patch'
+        'SonicPi.patch')
 md5sums=('SKIP'
          '298e2729cda0c33c9cec7f7f721c1bbd'
          'ba86680be610cc3d6f12d4a89b0f434d'
-         'fd330b2be9b52e9bee2fb9922141e2ca')
+         'fd330b2be9b52e9bee2fb9922141e2ca'
+         '91e90164ef041d12f1e7e9d4540e0a68'
+         'c1c63041f01c9b1394c3a3273f5ff543')
 
 prepare() {
   msg2 "Hook up qwt to qmake"
-  qmake -set QMAKEFEATURES /usr/local/qwt-6.1.2/features
+  #qmake -set QMAKEFEATURES /usr/local/qwt-6.1.2/features
+  qmake -set QMAKEFEATURES usr/share/qt4/mkspecs/features
   
+  #msg2 "Checkout v.2.9.0 branch as master branch is failing to run (seg-fault)"
+  #cd $srcdir/sonic-pi/
+  #git checkout tags/v2.9.0
+
   msg2 "Fix wrongly-named (on Arch) QT library"
   #cd $srcdir/sonic-pi/app/gui/qt
   find $srcdir/sonic-pi/app/gui/qt -type f -name "*" -readable -exec sed -i 's/lqt5scintilla2/lqscintilla2-qt5/g' {} +
+  #Patch build-ubuntu-app script to skip ubuntu-specific (and redundant) options
+  cd $srcdir/sonic-pi/app/gui/qt
+  patch < $srcdir/build-ubuntu-app.patch
+  patch < $srcdir/SonicPi.patch 
   #find . -type f -name "*" -exec sed -i 's/+= -L\/Users\/sam\/Downloads\/tmp\/QScintilla-gpl-2.9\/Qt4Qt5/+= -lqscintilla2-qt5/g' {} +
 }
 
 build() {
 #Based on instructions from INSTALL.md in upstream sources
 #Building
-  cd $srcdir/sonic-pi
-  cd app/server/bin
-  ./compile-extensions.rb
-  cd ../../gui/qt
-  ./rp-build-app
+  #cd $srcdir/sonic-pi
+  #cd app/server/bin
+  #./compile-extensions.rb
+  cd $srcdir/sonic-pi/app/gui/qt
+  ./build-ubuntu-app
   #Cleaning up object files
   cd $srcdir
   find . -type f -name "*.o" -exec rm {} +
+  find . ! -perm -g+r -exec chmod 666 {} +
   rm -f $srcdir/sonic-pi/app/gui/qt/sed*
 }
 
diff --git a/SonicPi.patch b/SonicPi.patch
new file mode 100644
index 000000000000..fc8aff0ae6cb
--- /dev/null
+++ b/SonicPi.patch
@@ -0,0 +1,13 @@
+--- src/sonic-pi/app/gui/qt/SonicPi.pro	2016-08-13 10:16:29.000000000 -0400
++++ SonicPiArch.pro	2016-08-13 10:17:39.257494865 -0400
+@@ -18,7 +18,9 @@
+ #-------------------------------------------------
+ 
+ TARGET = 'sonic-pi'
+-CONFIG += qscintilla2 qwt c++11
++CONFIG += qscintilla2 qwt c++11
++INCLUDEPATH += /usr/include/qwt5
++LIBS += -l qwt
+ 
+ QT += core gui concurrent network 
+ greaterThan(QT_MAJOR_VERSION, 4) {
diff --git a/build-ubuntu-app.patch b/build-ubuntu-app.patch
new file mode 100644
index 000000000000..4d8b525afc24
--- /dev/null
+++ b/build-ubuntu-app.patch
@@ -0,0 +1,69 @@
+--- src/sonic-pi/app/gui/qt/build-ubuntu-app	2016-08-13 00:46:00.000000000 -0400
++++ build-arch-app	2016-08-13 00:42:58.847786564 -0400
+@@ -8,7 +8,7 @@
+ echo "Please direct rage and suggestions to Factoid in (https://gitter.im/samaaron/sonic-pi)"
+ 
+ #Install dependencies for building supercollider, as well as qt5 and supporting libraries for gui
+-sudo apt-get install g++ ruby ruby-dev pkg-config git build-essential libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev libicu-dev libreadline6-dev libfftw3-dev libxt-dev libudev-dev cmake libboost1.58-dev libqwt-qt5-dev libqt5scintilla2-dev libqt5svg5-dev qt5-qmake qt5-default qttools5-dev qttools5-dev-tools qtdeclarative5-dev libqt5webkit5-dev qtpositioning5-dev libqt5sensors5-dev
++#sudo apt-get install g++ ruby ruby-dev pkg-config git build-essential libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev libicu-dev libreadline6-dev libfftw3-dev libxt-dev libudev-dev cmake libboost1.58-dev libqwt-qt5-dev libqt5scintilla2-dev libqt5svg5-dev qt5-qmake qt5-default qttools5-dev qttools5-dev-tools qtdeclarative5-dev libqt5webkit5-dev qtpositioning5-dev libqt5sensors5-dev
+ 
+ ### IF YOU HAVE PROBLEMS WITH qwt
+ #cd $SP_APP_SRC/../../../../
+@@ -30,30 +30,30 @@
+ #sudo make install
+ 
+ #Build supercollider 3.7.1 from source
+-cd ../../../../
+-git clone git@github.com:supercollider/supercollider.git
+-cd supercollider
+-git checkout Version-3.7.1
+-git submodule init && git submodule update
+-mkdir build
+-cd build
+-cmake -DSC_EL=no -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/qt5 ..
+-make
+-sudo make install
++#cd ../../../../
++#git clone git@github.com:supercollider/supercollider.git
++#cd supercollider
++#git checkout Version-3.7.1
++#git submodule init && git submodule update
++#mkdir build
++#cd build
++#cmake -DSC_EL=no -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/qt5 ..
++#make
++#sudo make install
+ #This should install to /usr/local/
+ 
+ #Build sc3 plugins and install to /usr/local/ so supercollider 3.7.1 can find them
+ cd ../
+-git clone https://github.com/supercollider/sc3-plugins.git
+-cd sc3-plugins
+-git checkout Version-3.7.1
+-git submodule init && git submodule update
+-cp -r external_libraries/nova-simd/* source/VBAPUGens
+-mkdir build
+-cd build
+-cmake -DSC_PATH=/usr/local/include/SuperCollider -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release ..
+-make
+-sudo make install
++#git clone https://github.com/supercollider/sc3-plugins.git
++#cd sc3-plugins
++#git checkout Version-3.7.1
++#git submodule init && git submodule update
++#cp -r external_libraries/nova-simd/* source/VBAPUGens
++#mkdir build
++#cd build
++#cmake -DSC_PATH=/usr/local/include/SuperCollider -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release ..
++#make
++#sudo make install
+ 
+ #Build sonic-pi server extensions, documentation, and binary.
+ cd $SP_APP_SRC
+@@ -62,5 +62,5 @@
+ cp -f ruby_help.tmpl ruby_help.h
+ ../../server/bin/qt-doc.rb -o ruby_help.h
+ lrelease SonicPi.pro 
+-qmake -qt=qt5 SonicPi.pro 
++qmake-qt5 SonicPi.pro 
+ make