From f18891f2ca05072fb9a74e1939636f562cd5f101f76e6a191bad2b6befc59bac Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 17 Jun 2016 05:51:06 +0000 Subject: [PATCH 1/2] Accepting request 402840 from home:plater Testing before factory, boo#985062 OBS-URL: https://build.opensuse.org/request/show/402840 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=25 --- buzztrax.changes | 7 +++++++ buzztrax.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/buzztrax.changes b/buzztrax.changes index 5aaa30f..3da6514 100644 --- a/buzztrax.changes +++ b/buzztrax.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 17 05:26:40 UTC 2016 - davejplater@gmail.com + +- Added -Wno-error=misleading-indentation to CFLAGS as a work + around for boo#985062 and to fix build with gcc6. Will be fixed + upstream. + ------------------------------------------------------------------- Tue Apr 5 13:25:16 UTC 2016 - dimstar@opensuse.org diff --git a/buzztrax.spec b/buzztrax.spec index 3c266ea..c093597 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -205,7 +205,7 @@ cp -v %{SOURCE2} . cp -v %{SOURCE1} . %build -#export CFLAGS="-Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=int-to-pointer-cast %%{optflags}" +export CFLAGS="-Wno-error=misleading-indentation %{optflags}" /bin/sh ./autogen.sh --noconfigure %configure --disable-static \ --disable-schemas-compile \ From 8eb4287e5ff76c502bc53fc86740868f6a7cb60553bbc8352f9cc6d23e733530 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 17 Jun 2016 12:32:03 +0000 Subject: [PATCH 2/2] Accepting request 402946 from home:plater Add conditional for gcc6 flag OBS-URL: https://build.opensuse.org/request/show/402946 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=26 --- buzztrax.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buzztrax.spec b/buzztrax.spec index c093597..836dd77 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -205,7 +205,9 @@ cp -v %{SOURCE2} . cp -v %{SOURCE1} . %build +%if 0%{?suse_version} > 1320 export CFLAGS="-Wno-error=misleading-indentation %{optflags}" +%endif /bin/sh ./autogen.sh --noconfigure %configure --disable-static \ --disable-schemas-compile \