5.9.90-1

3 files changed, 41 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f8d83f76299..2e28e39923df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 5.9.86
+	pkgver = 5.9.90
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	arch = i686
@@ -25,6 +25,7 @@ pkgbase = radium
 	depends = jack
 	depends = liblrdf
 	depends = libmpc
+	depends = libsndfile
 	depends = python2
 	depends = qt5-webkit
 	depends = qt5-x11extras
@@ -34,10 +35,12 @@ 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.86.tar.gz
+	source = https://github.com/kmatheussen/radium/archive/5.9.90.tar.gz
+	source = ignore-deprecated-errors.patch
 	source = use-system-libxcb.patch
 	source = use-system-vstsdk.patch
-	sha256sums = a8bf4dd70690c1e443c0f3a8c31949f931e728928ed8794e21298d0c453b740a
+	sha256sums = d0062574b66eccb76baee71e3eae0ca1ca29b7d9c54c76e2bf5b86e263715c41
+	sha256sums = 7825992e3d2e934a936f03d992d4b3d78994d9683e9e8a490c31b6487121e87b
 	sha256sums = 6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d
 	sha256sums = 045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344
 
diff --git a/PKGBUILD b/PKGBUILD
index d64fec5f152c..fe7bf1623d8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Teteros <teteros at teknik dot io>
 
 pkgname=radium
-pkgver=5.9.86
+pkgver=5.9.90
 pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(i686 x86_64)
@@ -18,6 +18,7 @@ depends=(
   jack
   liblrdf
   libmpc
+  libsndfile
   python2
   qt5-webkit
   qt5-x11extras
@@ -44,14 +45,19 @@ optdepends=(
 )
 options=(!strip)
 source=(https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz
+        ignore-deprecated-errors.patch
         use-system-libxcb.patch
         use-system-vstsdk.patch)
-sha256sums=('a8bf4dd70690c1e443c0f3a8c31949f931e728928ed8794e21298d0c453b740a'
+sha256sums=('d0062574b66eccb76baee71e3eae0ca1ca29b7d9c54c76e2bf5b86e263715c41'
+            '7825992e3d2e934a936f03d992d4b3d78994d9683e9e8a490c31b6487121e87b'
             '6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d'
             '045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344')
 
 prepare() {
   cd radium-$pkgver
+  
+  # https://github.com/kmatheussen/radium/issues/1237#issuecomment-576637993
+  patch -p1 < "$srcdir/ignore-deprecated-errors.patch"
 
   # Use system libxcb 1.13 rather than try to compile it
   patch -p1 < "$srcdir/use-system-libxcb.patch"
diff --git a/ignore-deprecated-errors.patch b/ignore-deprecated-errors.patch
new file mode 100644
index 000000000000..82beacd2a4b3
--- /dev/null
+++ b/ignore-deprecated-errors.patch
@@ -0,0 +1,27 @@
+diff -aur --no-dereference radium-5.9.90.pristine/Makefile.Qt radium-5.9.90.new/Makefile.Qt
+--- radium-5.9.90.pristine/Makefile.Qt	2020-01-19 11:44:45.000000000 +0000
++++ radium-5.9.90.new/Makefile.Qt	2020-01-21 10:45:11.136820499 +0000
+@@ -1618,12 +1618,12 @@
+ 	@echo "Changed (bin/radium_error_message):"
+ 	@echo $?
+ 	@echo
+-	$(CCC) -Wall -Werror $(P)Qt_Error.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -DCOMPILE_EXECUTABLE $(QT_GUI_CFLAGS) -o errormessagebin.o -Wno-missing-declarations
++	$(CCC) -Wall -Werror $(P)Qt_Error.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -DCOMPILE_EXECUTABLE $(QT_GUI_CFLAGS) -o errormessagebin.o -Wno-error=deprecated-declarations -Wno-missing-declarations
+ 	$(LINKER) `cat buildtype.opt` errormessagebin.o -o bin/radium_error_message $(QT_GUI_LDFLAGS)
+ 	rm errormessagebin.o
+ 
+ bin/radium_progress_window: $(P)Qt_progresswindow.cpp
+-	$(CCC) -Wall -Werror $(P)Qt_progresswindow.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -DP_CLIENT $(QT_GUI_CFLAGS) -o radium_progress_window.o
++	$(CCC) -Wall -Werror $(P)Qt_progresswindow.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -DP_CLIENT $(QT_GUI_CFLAGS) -o radium_progress_window.o -Wno-error=deprecated-declarations -Wno-missing-declarations
+ 	$(LINKER) `cat buildtype.opt` radium_progress_window.o -o bin/radium_progress_window $(QT_GUI_LDFLAGS)  
+ 	rm radium_progress_window.o
+ 
+@@ -1633,7 +1633,7 @@
+ 	rm radium_check_jack_status.o
+ 
+ bin/radium_check_opengl: OpenGL/CheckOpenGL.cpp common/Process.hpp
+-	$(CCC) -Wall -Werror OpenGL/CheckOpenGL.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -std=gnu++11 -DCOMPILE_EXECUTABLE -o radium_check_opengl.o
++	$(CCC) -Wall -Werror OpenGL/CheckOpenGL.cpp $(CPPOPT) $(QT_CFLAGS) $(OS_OPTS) -std=gnu++11 -DCOMPILE_EXECUTABLE -o radium_check_opengl.o -Wno-error=deprecated-declarations -Wno-missing-declarations
+ 	$(LINKER) `cat buildtype.opt` radium_check_opengl.o -o bin/radium_check_opengl $(QT_GUI_LDFLAGS) `$(PKGqt) --libs Qt5OpenGL`
+ 	rm radium_check_opengl.o
+