[SCM] rosegarden/master: Cherry pick upstream patch r14627 for GCC 6

stuart at users.alioth.debian.org stuart at users.alioth.debian.org
Fri Jul 15 09:14:58 UTC 2016


The following commit has been merged in the master branch:
commit ff262cefa5abe46eb3ddf6621a86f951f858de0a
Author: Stuart Prescott <stuart at debian.org>
Date:   Fri Jul 15 18:59:42 2016 +1000

    Cherry pick upstream patch r14627 for GCC 6
    
    Closes: #831099

diff --git a/debian/patches/gcc6-use-fabs.patch b/debian/patches/gcc6-use-fabs.patch
new file mode 100644
index 0000000..e5a8cc2
--- /dev/null
+++ b/debian/patches/gcc6-use-fabs.patch
@@ -0,0 +1,15 @@
+Description: Use fabs not abs for GCC6
+Author: Brendan Jones
+Origin: upstream svn r14627
+Bug-Debian: https://bugs.debian.org/831099
+--- a/src/gui/dialogs/PitchBendSequenceDialog.cpp
++++ b/src/gui/dialogs/PitchBendSequenceDialog.cpp
+@@ -919,7 +919,7 @@
+         {
+             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/debian/patches/series b/debian/patches/series
index 722dd0e..aa6d0d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-mime-types.patch
+gcc6-use-fabs.patch

-- 
rosegarden packaging



More information about the pkg-multimedia-commits mailing list