diff --git a/rosegarden-16.02-gcc6.patch b/rosegarden-16.02-gcc6.patch new file mode 100644 index 0000000..cb5f5b7 --- /dev/null +++ b/rosegarden-16.02-gcc6.patch @@ -0,0 +1,12 @@ +diff -Nurp rosegarden-16.02.orig/src/gui/dialogs/PitchBendSequenceDialog.cpp rosegarden-16.02.mod/src/gui/dialogs/PitchBendSequenceDialog.cpp +--- src/gui/dialogs/PitchBendSequenceDialog.cpp 2016-02-29 13:18:01.000000000 +0100 ++++ src/gui/dialogs/PitchBendSequenceDialog.cpp 2016-04-25 07:30:49.578374291 +0200 +@@ -919,7 +919,7 @@ PitchBendSequenceDialog::addStepwiseEven + { + const int rawStepSize = spinboxToControlDelta(m_stepSize); + if (rawStepSize == 0) { return; } +- numSteps = abs(float(valueChange) / float(rawStepSize) + 0.5); ++ numSteps = fabs(float(valueChange) / float(rawStepSize) + 0.5); + break; + } + } diff --git a/rosegarden.changes b/rosegarden.changes index 4fcd7e7..a3dcbd6 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 06:34:51 UTC 2016 - davejplater@gmail.com + +- Added upstream rosegarden-16.02-gcc6.patch to fix gcc6 build see + boo#985242 + ------------------------------------------------------------------- Mon Mar 21 09:57:14 UTC 2016 - davejplater@gmail.com diff --git a/rosegarden.spec b/rosegarden.spec index 722c0df..485f1b3 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -29,6 +29,7 @@ Source2: %{name}.1 # This patch fixes the file search paths for examples, templates and midi driver libraries. Patch1: rosegarden-10.10-filepaths.patch Patch2: rosegarden-14.02-fix-bashisms.patch +Patch3: rosegarden-16.02-gcc6.patch BuildRequires: alsa-devel BuildRequires: cmake >= 2.8.12 BuildRequires: dssi-devel @@ -93,6 +94,7 @@ See the changelog for details. %setup -q %patch1 %patch2 +%patch3 # When we build svn we need to execute bootstrap.sh #sh bootstrap.sh