[fix] replace .projucer patches with sed to avoid CRLF issues

3 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9dcc9bf2fbb8..6aff6f5cd01a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,12 +21,12 @@ pkgbase = cabbage-git
 	provides = cabbage
 	source = git+https://github.com/rorywalsh/cabbage.git#branch=master
 	source = git+https://github.com/WeAreROLI/JUCE.git#tag=5.2.0
-	source = fix_paths.patch
+	source = buildCabbage.patch
 	source = Cabbage.desktop
 	source = CabbageLite.desktop
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 0c2ddec78ea91ed5736bad0d81f21ea7
+	md5sums = 14c1f8e2590b0a98b3448a4267e679f2
 	md5sums = c499a03801cf0e760c14759ab1927bef
 	md5sums = 39992361c05babc4d12cbdcd2c3f6e04
 
diff --git a/PKGBUILD b/PKGBUILD
index 83de00b3d5c3..957308e47d57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eugene Cherny <iam@oscii.ru>
 pkgname=cabbage-git
 pkgrel=1 
-pkgver=1.0.0r1173
+pkgver=2.0.0r1173
 pkgdesc='A framework for audio software development'
 arch=('x86_64')
 url="http://cabbageaudio.com/"
@@ -9,15 +9,16 @@ license=('GPLv3')
 makedepends=('freeglut' 'curl' 'jack' 'libxcomposite' 'libxrandr' 'libxcursor'
              'libx11' 'libxinerama' 'mesa' 'gtk3' 'vim')
 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'
-        'fix_paths.patch'
+        'buildCabbage.patch'
         'Cabbage.desktop'
         'CabbageLite.desktop')
 md5sums=('SKIP'
          'SKIP'
-         '0c2ddec78ea91ed5736bad0d81f21ea7'
+         '14c1f8e2590b0a98b3448a4267e679f2'
          'c499a03801cf0e760c14759ab1927bef'
          '39992361c05babc4d12cbdcd2c3f6e04')
 
@@ -86,12 +87,16 @@ prepare() {
   # Cabbage
 
   cd "${srcdir}/cabbage"
-  patch -p1 < ../../fix_paths.patch
+  for f in *jucer; do
+    sed -i "s@/usr/local/include/csound@/usr/include/csound@g" "$f"
+    sed -i "s@/usr/local/lib@/usr/lib@g" "$f"
+  done
+  patch -p1 < ../../buildCabbage.patch
 }
 
 pkgver() {
 	cd "${srcdir}/cabbage"
-	printf "1.0.0r%s" "$(git rev-list --count HEAD)"
+	printf "2.0.0r%s" "$(git rev-list --count HEAD)"
 }
 
 build() {
@@ -105,16 +110,8 @@ package() {
 
   cd "${srcdir}/cabbage/Builds/LinuxMakefile/CabbageBuild/"
   install -d "${pkgdir}/opt/Cabbage"
-#  install -Dm644 Cabbage "${pkgdir}/opt/Cabbage/Cabbage"
-#  install -Dm644 CabbageLite "${pkgdir}/opt/Cabbage/CabbageLite"
-#  install -Dm644 CabbagePluginEffect.so "${pkgdir}/opt/Cabbage/CabbagePluginEffect.so"
-#  install -Dm644 CabbagePluginSynth.so "${pkgdir}/opt/Cabbage/CabbagePluginSynth.so"
-#  install -Dm644 cabbage.png "${pkgdir}/opt/Cabbage/cabbage.png"
-#  install -Dm644 opcodes.txt "${pkgdir}/opt/Cabbage/opcodes.txt"
-#  install -Dm644 Examples "${pkgdir}/opt/Cabbage/Examples"
   cp -R ./* "${pkgdir}/opt/Cabbage/"
-  
-
+  chmod -R 755 "${pkgdir}/opt/Cabbage"
 
   install -d "${pkgdir}/usr/bin"
   ln -s ../../opt/Cabbage/Cabbage "${pkgdir}/usr/bin/Cabbage"
diff --git a/buildCabbage.patch b/buildCabbage.patch
new file mode 100644
index 000000000000..c8346f2cca97
--- /dev/null
+++ b/buildCabbage.patch
@@ -0,0 +1,15 @@
+diff --git a/Builds/LinuxMakefile/buildCabbage b/Builds/LinuxMakefile/buildCabbage
+index a8aba851..dbb6ceee 100755
+--- a/Builds/LinuxMakefile/buildCabbage
++++ b/Builds/LinuxMakefile/buildCabbage
+@@ -60,9 +60,4 @@ cp ./../opcodes.txt CabbageBuild/opcodes.txt
+ cp ./../../Images/cabbage.png CabbageBuild/cabbage.png
+ cp -rf ../../Examples/ CabbageBuild/Examples
+ 
+-g++ ../../Source/testCsoundFile.cpp -o testCsoundFile -I"/usr/local/include/csound" -lcsound64
+-
+-#cp -rf ../../Docs/_book CabbageBuild/Docs
+-
+-sed "s@CURRENTDIR@$(pwd)@" dummy.desktop > CabbageBuild/cabbage.desktop
+-cp CabbageBuild/cabbage.desktop ~/.local/share/applications/
++g++ ../../Source/testCsoundFile.cpp -o testCsoundFile -I"/usr/include/csound" -lcsound64