Accepting request 484805 from multimedia:apps

1

OBS-URL: https://build.opensuse.org/request/show/484805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buzztrax?expand=0&rev=6

buzztrax-gcc7fix.patch

@@ -0,0 +1,26 @@
+Index: src/lib/core/machine.c
+===================================================================
+--- src/lib/core/machine.c.orig	2015-12-29 23:24:20.000000000 +0200
++++ src/lib/core/machine.c	2017-04-02 18:35:45.045240346 +0200
+@@ -2687,7 +2687,7 @@ bt_machine_dbg_print_parts (const BtMach
+ 
+ static xmlNodePtr
+ bt_machine_persistence_save (const BtPersistence * const persistence,
+-    const xmlNodePtr const parent_node)
++    const xmlNodePtr parent_node)
+ {
+   const BtMachine *const self = BT_MACHINE (persistence);
+   GstObject *machine;
+Index: src/lib/core/wave.c
+===================================================================
+--- src/lib/core/wave.c.orig	2015-08-16 14:21:45.000000000 +0200
++++ src/lib/core/wave.c	2017-04-02 18:42:45.757608888 +0200
+@@ -650,7 +650,7 @@ bt_wave_get_level_by_index (const BtWave
+ 
+ static xmlNodePtr
+ bt_wave_persistence_save (const BtPersistence * const persistence,
+-    const xmlNodePtr const parent_node)
++    const xmlNodePtr parent_node)
+ {
+   const BtWave *const self = BT_WAVE (persistence);
+   xmlNodePtr node = NULL;

buzztrax.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  3 08:33:09 UTC 2017 - davejplater@gmail.com
+
+- Fix gcc7 build with buzztrax-gcc7fix.patch and the following
+  CFLAGS  -Wno-error=format-truncation= and
+  -Wno-error=format-overflow=
+
 -------------------------------------------------------------------
 Tue Jun 28 12:08:14 UTC 2016 - davejplater@gmail.com
 

buzztrax.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package buzztrax
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@ Summary:        A music studio inspired by Buzz
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://buzztrax.org
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://files.buzztrax.org/releases/%{name}-%{version}.tar.gz
 Source1:        autogen.sh
 Source2:        COPYING-DOCS
 # Combined patch of cherry picked build fixes applies after 0.10.2
@@ -42,6 +42,8 @@ Patch0:         buzztrax-build.patch
 Patch1:         buzztrax-appdata.patch
 # PATCH-FIX gcc6 error misleading-indentation with patch from git.
 Patch2:         buzztrax-misleading-indentation.patch
+# PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch davepl@gmail.com -- fix gcc 7 duplicate constant errors
+Patch3:         buzztrax-gcc7fix.patch
 BuildRequires:  automake >= 1.13
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -203,11 +205,21 @@ This package contains buzztrax plugins
 %patch0
 %patch1
 %patch2
+%patch3
 # Rpmlint complains that COPYING-DOCS is outdated
 cp -v %{SOURCE2} .
 cp -v %{SOURCE1} .
 
 %build
+%if 1 == 0
+%define gcc_version 7
+export CC=gcc-7
+export CPP=cpp-7
+export CXX=g++-7
+%endif
+%if 0%{?gcc_version} >= 7
+export CFLAGS="%{optflags} -Wno-error=format-truncation= -Wno-error=format-overflow="
+%endif
 /bin/sh ./autogen.sh --noconfigure
 %configure --disable-static \
     --disable-schemas-compile \