summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornigeil2017-06-03 08:56:38 -0400
committernigeil2017-06-03 08:56:38 -0400
commit1c056ae3732ef8deaa89b0e7362a80fad9c21daa (patch)
treeae64bc6e53bfbff9dbd1725940167e9d43389707
parenta2ed6fa408e133bfc9cd750a74c479b7b758a4ae (diff)
downloadaur-1c056ae3732ef8deaa89b0e7362a80fad9c21daa.tar.gz
Final commit by nigeil; applied patch from Simon Dreher, not tested. New build scripts from upstream force you to install aubiofrom sources and install it into root+home directories, outside of fakeroot environment used by MAKEPKG. I STRONGLY recommend not using this package from the aur unless you know what this means for your arch install. I am marking it as out-of-date to grab attention to this issue, which I do not know how to fix.
-rwxr-xr-xPKGBUILD8
-rw-r--r--build-ubuntu-app.patch6
2 files changed, 8 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 6412f307443f..f8bb854328e0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,9 @@
# Maintainer: Nigel Michki <nigeil@yahoo.com>
# Contributor: Serhii Balbieko <sergey@balbeko.com>
+# Contributor: Simon Dreher <code@simon-dreher.de>
+
pkgname=sonic-pi-git
-pkgver=v2.11.1.r2.g5c7e054
+pkgver=v2.11.1.r573.g47821c6d7
pkgrel=1
pkgdesc="A music-centric programming environment, originally built for the raspberry pi."
arch=('i686'
@@ -38,7 +40,7 @@ md5sums=('SKIP'
'298e2729cda0c33c9cec7f7f721c1bbd'
'ba86680be610cc3d6f12d4a89b0f434d'
'fd330b2be9b52e9bee2fb9922141e2ca'
- '6ebb72a4e146c868a77c523050e85fb1'
+ '5ed2b42a1a0f6fd4840f1a7154b2d44f'
'c1c63041f01c9b1394c3a3273f5ff543')
prepare() {
@@ -46,7 +48,7 @@ prepare() {
qmake -set QMAKEFEATURES usr/share/qt4/mkspecs/features
msg2 "Fix wrongly-named (on Arch) QT library"
- find $srcdir/sonic-pi/app/gui/qt -type f -name "*" -readable -exec sed -i 's/lqt5scintilla2/lqscintilla2-qt5/g' {} +
+ 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
msg2 "Patch build-ubuntu-app script for Arch Linux"
diff --git a/build-ubuntu-app.patch b/build-ubuntu-app.patch
index 57056558a2ba..9a7122b71606 100644
--- a/build-ubuntu-app.patch
+++ b/build-ubuntu-app.patch
@@ -2,12 +2,12 @@ diff --git a/src/sonic-pi/app/gui/qt/build-ubuntu-app b/build-arch-app
index 2c6dfb4..41400dd 100755
--- a/src/sonic-pi/app/gui/qt/build-ubuntu-app
+++ b/build-arch-app
-@@ -8,7 +8,7 @@ echo "We're working to make this script a one shot solution for all Linux platfo
+@@ -8,7 +8,7 @@ echo "We're working to make this script a one shot solution for all Linux platform"
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 qtmultimedia5-dev libffi-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 qtmultimedia5-dev libffi-dev
+-sudo apt-get install -y 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 qtmultimedia5-dev libffi-dev
++#sudo apt-get install -y 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 qtmultimedia5-dev libffi-dev
### IF YOU HAVE PROBLEMS WITH qwt
#cd $SP_APP_SRC/../../../../