5.9.9-1: Hotfix

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb221f803351..4c0398e63107 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 5.9.8
+	pkgver = 5.9.9
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	arch = i686
@@ -30,16 +30,16 @@ 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.8.tar.gz
+	source = https://github.com/kmatheussen/radium/archive/5.9.9.tar.gz
 	source = use-libtirpc-headers.patch
 	source = use-system-libxcb.patch
 	source = use-system-vstsdk.patch
 	source = use-static-llvm40.patch
-	sha256sums = 879788452502684c3a36b0b9bc3ea7763f985acf71d616e4d9fa785ec90efe06
+	sha256sums = beced039475a423fc0ca4eb926ef133b33f8567319fc25ceacf259f5410b6743
 	sha256sums = f2596261f9ebd859f9850cbfc97edb7fd5d45cf8768ce47d0721cbf4b2d80c7e
 	sha256sums = 94de9befbe6530c721917445ee3a0c0202371e1b2229784b2ea6e0c0efaf7808
 	sha256sums = 75c606ed2c0f1f42449b2b2a7f6936c37be7a78e658ef4306f21edcd16eb2304
-	sha256sums = 413523f60ae7dea7aa2e223fc035f57b05693eea17ba3889eafaca9173fe5f3d
+	sha256sums = f4f35f6d0abb59f7db685f7e4e4d5e4c875fef83ed43672b4abad4da7f8989df
 
 pkgname = radium
 
diff --git a/PKGBUILD b/PKGBUILD
index fab3030b10de..c1812aa2c186 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Teteros <teteros at teknik dot io>
 
 pkgname=radium
-pkgver=5.9.8
+pkgver=5.9.9
 pkgrel=1
 pkgdesc="A graphical music editor. A next generation tracker."
 arch=('i686' 'x86_64')
@@ -44,11 +44,11 @@ source=("https://github.com/kmatheussen/${pkgname}/archive/${pkgver}.tar.gz"
         "use-system-libxcb.patch"
         "use-system-vstsdk.patch"
         "use-static-llvm40.patch")
-sha256sums=('879788452502684c3a36b0b9bc3ea7763f985acf71d616e4d9fa785ec90efe06'
+sha256sums=('beced039475a423fc0ca4eb926ef133b33f8567319fc25ceacf259f5410b6743'
             'f2596261f9ebd859f9850cbfc97edb7fd5d45cf8768ce47d0721cbf4b2d80c7e'
             '94de9befbe6530c721917445ee3a0c0202371e1b2229784b2ea6e0c0efaf7808'
             '75c606ed2c0f1f42449b2b2a7f6936c37be7a78e658ef4306f21edcd16eb2304'
-            '413523f60ae7dea7aa2e223fc035f57b05693eea17ba3889eafaca9173fe5f3d')
+            'f4f35f6d0abb59f7db685f7e4e4d5e4c875fef83ed43672b4abad4da7f8989df')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/use-static-llvm40.patch b/use-static-llvm40.patch
index 00c734171fa0..cd2d92c00b8d 100644
--- a/use-static-llvm40.patch
+++ b/use-static-llvm40.patch
@@ -1,6 +1,6 @@
-diff -aur --no-dereference radium-5.8.9.pristine/bin/packages/faust2/compiler/Makefile.unix radium-5.8.9.new/bin/packages/faust2/compiler/Makefile.unix
---- radium-5.8.9.pristine/bin/packages/faust2/compiler/Makefile.unix	2018-09-12 17:40:04.000000000 +0100
-+++ radium-5.8.9.new/bin/packages/faust2/compiler/Makefile.unix	2018-09-15 08:12:35.291841616 +0100
+diff -aur --no-dereference radium-5.9.9.pristine/bin/packages/faust2/compiler/Makefile.unix radium-5.9.9.new/bin/packages/faust2/compiler/Makefile.unix
+--- radium-5.9.9.pristine/bin/packages/faust2/compiler/Makefile.unix	2018-10-24 19:47:31.000000000 +0100
++++ radium-5.9.9.new/bin/packages/faust2/compiler/Makefile.unix	2018-10-24 21:01:11.425278974 +0100
 @@ -26,7 +26,7 @@
  # link a suitable llvm-config to a location somewhere on your PATH, or just
  # set LLVM_CONFIG manually.
@@ -28,10 +28,10 @@ diff -aur --no-dereference radium-5.8.9.pristine/bin/packages/faust2/compiler/Ma
  endif
  
  ifeq ($(system), Darwin)
-diff -aur --no-dereference radium-5.8.9.pristine/build_linux_common.sh radium-5.8.9.new/build_linux_common.sh
---- radium-5.8.9.pristine/build_linux_common.sh	2018-09-12 17:40:04.000000000 +0100
-+++ radium-5.8.9.new/build_linux_common.sh	2018-09-15 08:12:35.291841616 +0100
-@@ -106,17 +106,11 @@
+diff -aur --no-dereference radium-5.9.9.pristine/build_linux_common.sh radium-5.9.9.new/build_linux_common.sh
+--- radium-5.9.9.pristine/build_linux_common.sh	2018-10-24 19:47:31.000000000 +0100
++++ radium-5.9.9.new/build_linux_common.sh	2018-10-24 21:10:37.075259725 +0100
+@@ -106,19 +106,13 @@
  PYTHONLIBPATH=`$PYTHONEXE -c "import sys;print '-L'+sys.prefix+'/lib'"`
  PYTHONLIBNAME=`$PYTHONEXE -c "import sys;print '-lpython'+sys.version[:3]"`
  
@@ -46,9 +46,11 @@ diff -aur --no-dereference radium-5.8.9.pristine/build_linux_common.sh radium-5.
 +LLVM_OPTS=`llvm-config-4.0 --cppflags`
 +LLVMLIBS=`llvm-config-4.0 --link-static --libfiles`
  
+ export QSCINTILLA_PATH=`pwd`/bin/packages/QScintilla_gpl-2.10.1
+ 
  if env |grep INCLUDE_FAUSTDEV ; then
--    FAUSTLDFLAGS="bin/packages/QScintilla_gpl-2.10.1/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` `llvm-config --ldflags` $LLVMLIBS -lcrypto -lncurses"
-+    FAUSTLDFLAGS="bin/packages/QScintilla_gpl-2.10.1/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` $LLVMLIBS -lcrypto -lncurses"
+-    FAUSTLDFLAGS="$QSCINTILLA_PATH/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` `llvm-config --ldflags` $LLVMLIBS -lcrypto -lncurses"
++    FAUSTLDFLAGS="$QSCINTILLA_PATH/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` $LLVMLIBS -lcrypto -lncurses"
  else    
      FAUSTLDFLAGS=""
  fi