[upd] Update to version 2.0.0r1236

Remove buildCabbage.patch as it has been integrated upstream. Bump JUCE
to v5.3.2 as Cabbage now supports it. Add myself as a maintainer in the
PKGBUILD per
https://wiki.archlinux.org/index.php/Arch_User_Repository#Rules_of_submission.

3 files changed, 5 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 841df38fd571..039fd2c9c1a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cabbage-git
 	pkgdesc = A framework for audio software development
-	pkgver = 2.0.0r1226
+	pkgver = 2.0.0r1236
 	pkgrel = 1
 	url = http://cabbageaudio.com/
 	arch = x86_64
@@ -22,14 +22,12 @@ pkgbase = cabbage-git
 	provides = cabbage
 	conflicts = cabbage
 	source = git+https://github.com/rorywalsh/cabbage.git#branch=master
-	source = git+https://github.com/WeAreROLI/JUCE.git#tag=5.2.0
-	source = buildCabbage.patch
+	source = git+https://github.com/WeAreROLI/JUCE.git#tag=5.3.2
 	source = cabbage.png
 	source = Cabbage.desktop
 	source = CabbageLite.desktop
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 123ac4cc22f58bb00e2dd34a290f3156
 	md5sums = c3c8e35dd46c86f22a3565aa4dd828a8
 	md5sums = 35cfc89844c90769f4dc4f8309b340b1
 	md5sums = c39a85709e31e03a0850f2e324a4faea
diff --git a/PKGBUILD b/PKGBUILD
index e368c8d70974..f46f2677d187 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Eugene Cherny <iam@oscii.ru>
+# Maintainer: Zoë Sparks <zoe@milky.flowers>
 pkgname=cabbage-git
 pkgrel=1 
-pkgver=2.0.0r1226
+pkgver=2.0.0r1236
 pkgdesc='A framework for audio software development'
 arch=('x86_64')
 url="http://cabbageaudio.com/"
@@ -12,14 +13,12 @@ depends=('csound' 'steinberg-vst36')
 conflicts=('cabbage')
 provides=('cabbage')
 source=('git+https://github.com/rorywalsh/cabbage.git#branch=master'
-        'git+https://github.com/WeAreROLI/JUCE.git#tag=5.2.0'
-        'buildCabbage.patch'
+        'git+https://github.com/WeAreROLI/JUCE.git#tag=5.3.2'
         'cabbage.png'
         'Cabbage.desktop'
         'CabbageLite.desktop')
 md5sums=('SKIP'
          'SKIP'
-         '123ac4cc22f58bb00e2dd34a290f3156'
          'c3c8e35dd46c86f22a3565aa4dd828a8'
          '35cfc89844c90769f4dc4f8309b340b1'
          'c39a85709e31e03a0850f2e324a4faea')
@@ -85,9 +84,6 @@ prepare() {
   sed -i "/CabbageBuild\/cabbage.desktop/d" "$b"
 
   dos2unix "${srcdir}/cabbage/Source/Settings/CabbageSettings.cpp"
-
-  cd "$srcdir"
-  patch -p0 < buildCabbage.patch
 }
 
 pkgver() {
diff --git a/buildCabbage.patch b/buildCabbage.patch
deleted file mode 100644
index e79e8517bcb5..000000000000
--- a/buildCabbage.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- cabbage/Builds/LinuxMakefile/buildCabbage	2018-05-26 02:00:50.542132073 -0400
-+++ cabbage/Builds/LinuxMakefile/buildCabbage.new	2018-05-26 02:17:29.522074962 -0400
-@@ -35,46 +35,48 @@
- make -f MakePluginSynth -j6 
- else
- #release mode  default
-+
-+mkdir -p ./install/bin ./install/images
-+
- ../../../JUCE/extras/Projucer/Builds/LinuxMakefile/build/Projucer --resave ../../CabbageIDE.jucer
- mv Makefile MakeCabbageIDE
- make -f MakeCabbageIDE clean CONFIG=Release
- make -f MakeCabbageIDE -j6 CONFIG=Release
--cp ./build/Cabbage /usr/bin/Cabbage
-+cp ./build/Cabbage ./install/bin/Cabbage
- 
- ../../../JUCE/extras/Projucer/Builds/LinuxMakefile/build/Projucer --resave ../../CabbagePlugin.jucer
- mv Makefile MakePluginEffect
- 
- make -f MakePluginEffect clean CONFIG=Release
- make -f MakePluginEffect -j6 CONFIG=Release
--cp ./build/CabbagePlugin.so /usr/bin/CabbagePluginEffect.so
-+cp ./build/CabbagePlugin.so ./install/bin/CabbagePluginEffect.so
- 
- ../../../JUCE/extras/Projucer/Builds/LinuxMakefile/build/Projucer --resave ../../CabbagePluginSynth.jucer
- mv Makefile MakePluginSynth
- 
- make -f MakePluginSynth clean CONFIG=Release
- make -f MakePluginSynth -j6 CONFIG=Release
--cp ./build/CabbagePlugin.so /usr/bin/CabbagePluginSynth.so
-+cp ./build/CabbagePlugin.so ./install/bin/CabbagePluginSynth.so
- 
- ../../../JUCE/extras/Projucer/Builds/LinuxMakefile/build/Projucer --resave ../../CabbageLite.jucer
- mv Makefile MakeCabbageLite
- 
- make -f MakeCabbageLite clean CONFIG=Release
- make -f MakeCabbageLite -j6 CONFIG=Release
--cp ./build/CabbageLite /usr/bin/CabbageLite
-+cp ./build/CabbageLite ./install/bin/CabbageLite
- 
- fi  
- 
--cp ./../opcodes.txt /usr/bin/opcodes.txt
--cp ./../../Images/cabbage.png /usr/share/icons/hicolor/512x512/apps/cabbage.png
--cp ./../../Images/cabbage.png /usr/share/icons/hicolor/512x512/apps/cabbagelite.png
--mkdir /usr/share/doc/cabbage/
--cp -rf ../../Examples/ /usr/share/doc/cabbage/Examples
-+cp ./../opcodes.txt ./install/bin/opcodes.txt
-+cp ./../../Images/cabbage.png ./install/images/cabbage.png
-+cp ./../../Images/cabbage.png ./install/images/cabbagelite.png
-+cp -rf ../../Examples ./install/
- 
- g++ ../../Source/testCsoundFile.cpp -o testCsoundFile -I"/usr/include/csound" -lcsound64
--cp testCsoundFile /usr/bin/testCsoundFile
-+cp testCsoundFile ./install/bin/testCsoundFile
- #cp -rf ../../Docs/_book CabbageBuild/Docs
- 
- sed "s@CURRENTDIR@$(pwd)@" Cabbage.desktop > cabbage.desktop
- sed "s@CURRENTDIR@$(pwd)@" Cabbage.desktop > cabbagLite.desktop
--# sed "s@CURRENTDIR@$(pwd)@" dummy.desktop > CabbageBuild/cabbagelite.desktop
--cp cabbage.desktop ~/.local/share/applications/
-+#sed "s@CURRENTDIR@$(pwd)@" dummy.desktop > CabbageBuild/cabbagelite.desktop
-+cp cabbage.desktop ./install/