6.5.84-1

4 files changed, 25 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79d00388d3eb..80807ab4d20f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 6.5.77
+	pkgver = 6.5.84
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	arch = x86_64
@@ -8,7 +8,6 @@ pkgbase = radium
 	license = GPL2
 	makedepends = boost
 	makedepends = cmake
-	makedepends = gcc9
 	makedepends = ladspa
 	makedepends = libxcursor
 	makedepends = libxinerama
@@ -31,7 +30,6 @@ pkgbase = radium
 	depends = qt5-svg
 	depends = qt5-webkit
 	depends = qt5-x11extras
-	depends = shared-mime-info
 	depends = speex
 	depends = ttf-bitstream-vera
 	depends = ttf-croscore
@@ -41,16 +39,14 @@ pkgbase = radium
 	optdepends = ladspa-plugins: package group for plugins normally included in binary releases
 	optdepends = vst-plugins: more plugins
 	options = !strip
-	source = radium-6.5.77.tar.gz::https://github.com/kmatheussen/radium/archive/6.5.77.tar.gz
+	source = radium-6.5.84.tar.gz::https://github.com/kmatheussen/radium/archive/6.5.84.tar.gz
 	source = https://github.com/grame-cncm/faust/releases/download/2.27.2/faust-2.27.2.tar.gz
-	source = downgrade-gcc-libpd.patch
 	source = use-updated-faust.patch
 	source = add-vstsdk-location-var.patch
-	sha256sums = e92c2bfd4331587098bad32e8f0be45afc81f7b4703ed9615f9a9788f57cb223
+	sha256sums = 0c2fd1c508a344e2421862ae4e63b8292bc1818c2dae472e5a92d2343822a1c8
 	sha256sums = c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c
-	sha256sums = 88d5a8d2d8074f7993e6fd8bafc84355bf0d1bb6405b391caa3d94f23755c1a0
 	sha256sums = 8e6865eff42e0d1797a363f3ce6debfcdeab3aa0a4700f1bbca47916735ea8fd
-	sha256sums = 2466b88e345c48be43a835ee0001aac55189ce74b4181d3c4275e459089e7ccc
+	sha256sums = 28ef8c1e8ffed45e39d8fac9b31c18902905eabea0322ee91bd1369a2e5f907f
 
 pkgname = radium
 
diff --git a/PKGBUILD b/PKGBUILD
index 8f126f6c2c6f..25cadb547c30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=radium
-pkgver=6.5.77
+pkgver=6.5.84
 pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(x86_64)
@@ -25,7 +25,6 @@ depends=(
   qt5-svg
   qt5-webkit
   qt5-x11extras
-  shared-mime-info
   speex
   ttf-bitstream-vera
   ttf-croscore
@@ -34,7 +33,6 @@ depends=(
 makedepends=(
   boost
   cmake
-  gcc9
   ladspa
   libxcursor
   libxinerama
@@ -53,15 +51,13 @@ optdepends=(
 options=(!strip)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
         "https://github.com/grame-cncm/faust/releases/download/2.27.2/faust-2.27.2.tar.gz"
-        downgrade-gcc-libpd.patch
         use-updated-faust.patch
         add-vstsdk-location-var.patch
 )
-sha256sums=('e92c2bfd4331587098bad32e8f0be45afc81f7b4703ed9615f9a9788f57cb223'
+sha256sums=('0c2fd1c508a344e2421862ae4e63b8292bc1818c2dae472e5a92d2343822a1c8'
             'c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c'
-            '88d5a8d2d8074f7993e6fd8bafc84355bf0d1bb6405b391caa3d94f23755c1a0'
             '8e6865eff42e0d1797a363f3ce6debfcdeab3aa0a4700f1bbca47916735ea8fd'
-            '2466b88e345c48be43a835ee0001aac55189ce74b4181d3c4275e459089e7ccc')
+            '28ef8c1e8ffed45e39d8fac9b31c18902905eabea0322ee91bd1369a2e5f907f')
 
 prepare() {
   cd radium-$pkgver
@@ -69,9 +65,6 @@ prepare() {
   # Add VST2SDK env var so we can use VST2 headers from steinberg-vst36 in AUR
   patch -p1 < "$srcdir/add-vstsdk-location-var.patch"
 
-  # https://github.com/kmatheussen/radium/issues/1298
-  patch -p1 < "$srcdir/downgrade-gcc-libpd.patch"
-
   # https://github.com/kmatheussen/radium/pull/1299
   patch -p1 < "$srcdir/use-updated-faust.patch"
 
diff --git a/add-vstsdk-location-var.patch b/add-vstsdk-location-var.patch
index 92615a409161..a3e24f4f8b8a 100644
--- a/add-vstsdk-location-var.patch
+++ b/add-vstsdk-location-var.patch
@@ -1,18 +1,6 @@
-diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/Makefile.Qt radium-6.0.99.new/Makefile.Qt
---- radium-6.0.99.old/Makefile.Qt	2020-09-01 14:37:08.000000000 +0100
-+++ radium-6.0.99.new/Makefile.Qt	2020-09-01 20:10:33.357697286 +0100
-@@ -306,7 +306,7 @@
- 
- FLAGOPTS = $(DEFINES) -DGUIISQT -DFULL_VERSION=$(FULL_VERSION) -DIS_LITTLE_ENDIAN=1 -DUSE_OPENGL=1 $(VISUAL) $(REQTYPE_TYPE) $(MENU_TYPE)
- 
--COMMONOPT = -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/vstsdk2.4/ -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference 
-+COMMONOPT = -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I${RADIUM_VST2SDK_PATH} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference 
- #-fdelete-null-pointer-checks 
- # -Werror
- 
-diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/check_dependencies.sh radium-6.0.99.new/check_dependencies.sh
---- radium-6.0.99.old/check_dependencies.sh	2020-09-01 14:37:08.000000000 +0100
-+++ radium-6.0.99.new/check_dependencies.sh	2020-09-01 20:12:11.634639063 +0100
+diff '--color=always' -aur --no-dereference '--exclude=.git' radium-6.5.84.old/check_dependencies.sh radium-6.5.84.new/check_dependencies.sh
+--- radium-6.5.84.old/check_dependencies.sh	2020-12-06 19:02:42.000000000 +0000
++++ radium-6.5.84.new/check_dependencies.sh	2020-12-07 15:42:25.481575479 +0000
 @@ -226,13 +226,6 @@
      exit 5
  fi
@@ -27,9 +15,21 @@ diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/check_dependencies
  if [[ $4 == "test_build" ]] ; then
      if [ `uname` == "Linux" ] ; then
          if [ ! -f bin/packages/deletemetorebuild ] ; then
-diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/pluginhost/Builds/Linux/Makefile radium-6.0.99.new/pluginhost/Builds/Linux/Makefile
---- radium-6.0.99.old/pluginhost/Builds/Linux/Makefile	2020-09-01 14:37:08.000000000 +0100
-+++ radium-6.0.99.new/pluginhost/Builds/Linux/Makefile	2020-09-01 20:18:12.189005049 +0100
+diff '--color=always' -aur --no-dereference '--exclude=.git' radium-6.5.84.old/Makefile.Qt radium-6.5.84.new/Makefile.Qt
+--- radium-6.5.84.old/Makefile.Qt	2020-12-06 19:02:42.000000000 +0000
++++ radium-6.5.84.new/Makefile.Qt	2020-12-07 15:44:32.972013226 +0000
+@@ -306,7 +306,7 @@
+ 
+ FLAGOPTS = $(DEFINES) -DGUIISQT -DFULL_VERSION=$(FULL_VERSION) -DIS_LITTLE_ENDIAN=1 -DUSE_OPENGL=1 $(VISUAL) $(REQTYPE_TYPE) $(MENU_TYPE)
+ 
+-COMMONOPT = -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/vstsdk2.4/ -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference
++COMMONOPT = -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I${RADIUM_VST2SDK_PATH} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference
+ #-fdelete-null-pointer-checks 
+ # -Werror
+ 
+diff '--color=always' -aur --no-dereference '--exclude=.git' radium-6.5.84.old/pluginhost/Builds/Linux/Makefile radium-6.5.84.new/pluginhost/Builds/Linux/Makefile
+--- radium-6.5.84.old/pluginhost/Builds/Linux/Makefile	2020-12-06 19:02:42.000000000 +0000
++++ radium-6.5.84.new/pluginhost/Builds/Linux/Makefile	2020-12-07 15:42:25.481575479 +0000
 @@ -8,7 +8,7 @@
    CONFIG=Debug

  endif

diff --git a/downgrade-gcc-libpd.patch b/downgrade-gcc-libpd.patch
deleted file mode 100644
index a5f603eea7c3..000000000000
--- a/downgrade-gcc-libpd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur --no-dereference '--exclude=.git' radium-6.5.76.pristine/bin/packages/build.sh radium-6.5.76.new/bin/packages/build.sh
---- radium-6.5.76.pristine/bin/packages/build.sh	2020-11-13 13:20:36.000000000 +0000
-+++ radium-6.5.76.new/bin/packages/build.sh	2020-11-14 16:45:00.047753365 +0000
-@@ -133,7 +133,7 @@
- sed -i '/define CFLAGS/ s|")| -I/usr/include/tirpc ")|' make.scm
- sed -i 's/k_cext$//' make.scm
- sed -i 's/oscx //' make.scm
--sed -i 's/gcc -O3/clang -Wno-return-type -O3/' make.scm
-+sed -i 's/gcc/gcc-9/' make.scm
- make clean
- make -j`nproc`
- cd ..