5.9.67-1: Bump Version

Also switch away from gcc9 to clang for now due to build issues with JUCE upstream:
https://github.com/kmatheussen/radium/issues/1222

3 files changed, 46 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae928933aa1b..4d3284771123 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 5.9.65
+	pkgver = 5.9.67
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = boost
+	makedepends = clang
 	makedepends = cmake
 	makedepends = libxcursor
 	makedepends = libxinerama
@@ -30,11 +31,13 @@ pkgbase = radium
 	optdepends = calf-ladspa: Default chorus plugin
 	optdepends = ladspa-plugins: Package group for default radium plugins incl in binary releases
 	options = !strip
-	source = https://github.com/kmatheussen/radium/archive/5.9.65.tar.gz
+	source = https://github.com/kmatheussen/radium/archive/5.9.67.tar.gz
+	source = use-clang.patch
 	source = use-libtirpc-headers.patch
 	source = use-system-libxcb.patch
 	source = use-system-vstsdk.patch
-	sha256sums = 8db661e0337a1b8dcd3ce8f9c7e997c1bd4506b1c43c0f31fca523edf057cb1e
+	sha256sums = e1f19c2b447703efb1eb1bf40908526c588da32619614649c5b608ee1cf29e0a
+	sha256sums = 1e6e4d9110ca1e939d62eb68e89deb03facc41a5d7d0bde3aa6e4e5fff768346
 	sha256sums = 0dfa3014bc6a66989564c7da2d963681f5d129eb0be28153744693dd533e4909
 	sha256sums = 6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d
 	sha256sums = 045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344
diff --git a/PKGBUILD b/PKGBUILD
index 7f3c9001c4f4..f4d7dd4abeda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Teteros <teteros at teknik dot io>
 
 pkgname=radium
-pkgver=5.9.65
+pkgver=5.9.67
 pkgrel=1
 pkgdesc="A graphical music editor. A next generation tracker."
 arch=('i686' 'x86_64')
@@ -25,6 +25,7 @@ depends=(
 )
 makedepends=(
   'boost'
+  'clang'
   'cmake'
   'libxcursor'
   'libxinerama'
@@ -40,10 +41,12 @@ optdepends=(
 )
 options=(!strip)
 source=("https://github.com/kmatheussen/${pkgname}/archive/${pkgver}.tar.gz"
+        "use-clang.patch"
         "use-libtirpc-headers.patch"
         "use-system-libxcb.patch"
         "use-system-vstsdk.patch")
-sha256sums=('8db661e0337a1b8dcd3ce8f9c7e997c1bd4506b1c43c0f31fca523edf057cb1e'
+sha256sums=('e1f19c2b447703efb1eb1bf40908526c588da32619614649c5b608ee1cf29e0a'
+            '1e6e4d9110ca1e939d62eb68e89deb03facc41a5d7d0bde3aa6e4e5fff768346'
             '0dfa3014bc6a66989564c7da2d963681f5d129eb0be28153744693dd533e4909'
             '6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d'
             '045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344')
@@ -51,6 +54,9 @@ sha256sums=('8db661e0337a1b8dcd3ce8f9c7e997c1bd4506b1c43c0f31fca523edf057cb1e'
 prepare() {
   cd "${pkgname}-${pkgver}"
 
+  # https://github.com/kmatheussen/radium/issues/1222
+  patch -p1 < "${srcdir}/use-clang.patch"
+
   # glibc-2.27 deprecated legacy rpc, header files for libpd are in libtirpc
   patch -p1 < "${srcdir}/use-libtirpc-headers.patch"
 
diff --git a/use-clang.patch b/use-clang.patch
new file mode 100644
index 000000000000..8d8fdfc265f6
--- /dev/null
+++ b/use-clang.patch
@@ -0,0 +1,32 @@
+diff -aur --no-dereference radium-5.9.67.pristine/bin/packages/build.sh radium-5.9.67.new/bin/packages/build.sh
+--- radium-5.9.67.pristine/bin/packages/build.sh	2019-06-19 13:56:47.000000000 +0100
++++ radium-5.9.67.new/bin/packages/build.sh	2019-06-19 17:55:42.121298953 +0100
+@@ -13,12 +13,12 @@
+ export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -fPIC -fno-strict-aliasing"
+ export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -fPIC -fno-strict-aliasing"
+ 
+-DASCC=gcc
+-DASCXX=g++
++#DASCC=gcc
++#DASCXX=g++
+ 
+ # These two lines should be uncommented if setting CLANG=1 in build_linux_common.sh
+-#DASCC=clang
+-#DASCXX=clang++
++DASCC=clang
++DASCXX=clang++
+ 
+ if ! env |grep RADIUM_QT_VERSION ; then
+     echo "Must define RADIUM_QT_VERSION to either 4 or 5. For instance: \"RADIUM_QT_VERSION=5 make packages\""
+diff -aur --no-dereference radium-5.9.67.pristine/build_linux_common.sh radium-5.9.67.new/build_linux_common.sh
+--- radium-5.9.67.pristine/build_linux_common.sh	2019-06-19 13:56:47.000000000 +0100
++++ radium-5.9.67.new/build_linux_common.sh	2019-06-19 17:55:11.894631896 +0100
+@@ -57,7 +57,7 @@
+ # REQUIRES_RTTI=1 cmake -DLLVM_ENABLE_PROJECTS="clang;compiler-rt" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$GCC_PREFIX/bin/gcc -DCMAKE_CXX_COMPILER=$GCC_PREFIX/bin/g++ -DGCC_INSTALL_PREFIX=$GCC_PREFIX -DCMAKE_INSTALL_PREFIX=/home/kjetil/site -DLLVM_ENABLE_RTTI=ON ../llvm 
+ # REQUIRES_RTTI=1 make REQUIRES_RTTI=1 -j2
+ 
+-USE_CLANG=0
++USE_CLANG=1
+ 
+ if [[ $USE_CLANG == 1 ]] ; then
+     export CLANG_PREFIX=$(dirname `which clang`)/../