From 6cafa4cf9d667fe71ef696702ffcd3785d74d8ba8fbc025bfc932b04be935cf4 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Mon, 11 Jun 2018 14:25:52 +0000
Subject: [PATCH 1/2] Accepting request 616051 from home:plater

Fix gcc8 build failure with -Wno-error=restrict.

OBS-URL: https://build.opensuse.org/request/show/616051
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=38
---
 buzztrax.changes |  5 +++++
 buzztrax.spec    | 15 +++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/buzztrax.changes b/buzztrax.changes
index cf4cd69..65f09a6 100644
--- a/buzztrax.changes
+++ b/buzztrax.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 11 11:38:06 UTC 2018 - davejplater@gmail.com
+
+- Fix gcc8 build failure with -Wno-error=restrict.
+
 -------------------------------------------------------------------
 Sat Mar 24 06:22:13 UTC 2018 - davejplater@gmail.com
 
diff --git a/buzztrax.spec b/buzztrax.spec
index 1f2280c..61ce834 100644
--- a/buzztrax.spec
+++ b/buzztrax.spec
@@ -31,7 +31,7 @@ Name:           buzztrax
 Version:        0.10.2
 Release:        0
 Summary:        A music studio inspired by Buzz
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://buzztrax.org
 Source0:        http://files.buzztrax.org/releases/%{name}-%{version}.tar.gz
@@ -212,15 +212,14 @@ cp -v %{SOURCE1} .
 
 %build
 %if 1 == 0
-%define gcc_version 7
-export CC=gcc-7
-export CPP=cpp-7
-export CXX=g++-7
+%define gcc_version 8
+export CC=gcc-8
+export CPP=cpp-8
+export CXX=g++-8
 %endif
 export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
-%if 0%{?gcc_version} >= 7
-export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types"
-%endif
+export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict"
+export CXXFLAGS="$CFLAGS"
 
 /bin/sh ./autogen.sh --noconfigure
 %configure --disable-static \

From a0166cef29fd5078cc9244ccc99593d6e87ccd704db5d4fce73a13aa542c2cc5 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Mon, 18 Jun 2018 10:46:06 +0000
Subject: [PATCH 2/2] Accepting request 617488 from home:plater

Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.

OBS-URL: https://build.opensuse.org/request/show/617488
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=39
---
 buzztrax-newfix.patch | 28 ++++++++++++++++++++++++++++
 buzztrax.changes      |  5 +++++
 buzztrax.spec         |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 buzztrax-newfix.patch

diff --git a/buzztrax-newfix.patch b/buzztrax-newfix.patch
new file mode 100644
index 0000000..614a1d2
--- /dev/null
+++ b/buzztrax-newfix.patch
@@ -0,0 +1,28 @@
+From: Dave Plater <davejplater@gmail.com>
+Date: 2018-06-18 12:34:22 +0200
+Subject: Something has changed in Factory
+References: 
+Upstream: to be submitted
+
+Something has changed in Factory to cause the "-" to be outlawed in "name" in:
+GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)
+
+Index: src/gst/dec/bt-dec.c
+===================================================================
+--- src/gst/dec/bt-dec.c.orig	2015-12-29 23:24:20.000000000 +0200
++++ src/gst/dec/bt-dec.c	2018-06-18 10:59:18.702989750 +0200
+@@ -947,12 +947,12 @@ plugin_init (GstPlugin * plugin)
+       bt_dec_type_find, exts, GST_CAPS_ANY, NULL, NULL);
+   g_free (exts);
+ 
+-  return gst_element_register (plugin, "buzztrax-dec", GST_RANK_MARGINAL,
++  return gst_element_register (plugin, "buzztrax_dec", GST_RANK_MARGINAL,
+       BT_TYPE_DEC);
+ }
+ 
+ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+     GST_VERSION_MINOR,
+-    buzztrax - dec,
++    buzztrax_dec,
+     "Buzztrax song renderer",
+     plugin_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.buzztrax.org");
diff --git a/buzztrax.changes b/buzztrax.changes
index 65f09a6..a0a115b 100644
--- a/buzztrax.changes
+++ b/buzztrax.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 18 10:22:38 UTC 2018 - davejplater@gmail.com
+
+- Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.
+
 -------------------------------------------------------------------
 Mon Jun 11 11:38:06 UTC 2018 - davejplater@gmail.com
 
diff --git a/buzztrax.spec b/buzztrax.spec
index 61ce834..ba5ec98 100644
--- a/buzztrax.spec
+++ b/buzztrax.spec
@@ -44,6 +44,7 @@ Patch1:         buzztrax-appdata.patch
 Patch2:         buzztrax-misleading-indentation.patch
 # PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch davepl@gmail.com -- fix gcc 7 duplicate constant errors
 Patch3:         buzztrax-gcc7fix.patch
+Patch4:         buzztrax-newfix.patch
 BuildRequires:  automake >= 1.13
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -206,6 +207,7 @@ This package contains buzztrax plugins
 %patch1
 %patch2
 %patch3
+%patch4
 # Rpmlint complains that COPYING-DOCS is outdated
 cp -v %{SOURCE2} .
 cp -v %{SOURCE1} .