[SCM] muse/master: Fix FTBFS with GCC 6

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e23d525469f85279f5f4e1e33fcf36433f9c9417
Author: Philip Chung <philipchung1995 at yahoo.com>
Date:   Wed Aug 31 21:53:17 2016 +0100

    Fix FTBFS with GCC 6
    
    Closes: #831147

diff --git a/debian/patches/1002-abs-errors.patch b/debian/patches/1002-abs-errors.patch
new file mode 100644
index 0000000..0cf080c
--- /dev/null
+++ b/debian/patches/1002-abs-errors.patch
@@ -0,0 +1,62 @@
+Description: Fix errors related to the abs() function
+Author: Philip Chung <philipchung1995 at yahoo.com>
+Bug-Debian: https://bugs.debian.org/831147
+---
+ midiedit/ecanvas.cpp       |    1 +
+ sync.cpp                   |    4 ++--
+ widgets/knob.cpp           |    2 +-
+ widgets/knob_and_meter.cpp |    2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+--- muse.orig/muse/widgets/knob.cpp
++++ muse/muse/widgets/knob.cpp
+@@ -172,7 +172,7 @@ void Knob::drawKnob(QPainter* p, const Q
+       QPen pn;
+       pn.setCapStyle(Qt::FlatCap);
+ 
+-      pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
++      pn.setColor(d_shinyColor.lighter(l_const + std::abs(value() * l_slope)));
+       pn.setWidth(d_shineWidth * 2);
+       p->setPen(pn);
+       p->drawArc(aRect, 0, 360 * 16);
+--- muse.orig/muse/widgets/knob_and_meter.cpp
++++ muse/muse/widgets/knob_and_meter.cpp
+@@ -171,7 +171,7 @@ void KnobWithMeter::drawKnob(QPainter* p
+       QPen pn;
+       pn.setCapStyle(Qt::FlatCap);
+ 
+-      pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
++      pn.setColor(d_shinyColor.lighter(l_const + std::abs(value() * l_slope)));
+       pn.setWidth(d_shineWidth * 2);
+       p->setPen(pn);
+       p->drawArc(aRect, 0, 360 * 16);
+--- muse.orig/muse/midiedit/ecanvas.cpp
++++ muse/muse/midiedit/ecanvas.cpp
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <math.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
+--- muse.orig/muse/sync.cpp
++++ muse/muse/sync.cpp
+@@ -961,7 +961,7 @@ void MidiSeq::realtimeSystemInput(int po
+                               if(_preDetect && pole == 0)
+                               {
+                                 double real_tempo = 60.0/(avg_diff * 24.0);
+-                                double real_tempo_diff = abs(real_tempo - _lastRealTempo);
++                                double real_tempo_diff = std::abs(real_tempo - _lastRealTempo);
+                                 
+                                 // If the tempo changed a large amount, reset.
+                                 if(real_tempo_diff >= 10.0)  // TODO: User-adjustable?
+@@ -1009,7 +1009,7 @@ void MidiSeq::realtimeSystemInput(int po
+                               if(pole == fin_idx)
+                               {
+                                 double real_tempo = 60.0/(avg_diff * 24.0);
+-                                double real_tempo_diff = abs(real_tempo - _lastRealTempo);
++                                double real_tempo_diff = std::abs(real_tempo - _lastRealTempo);
+                                 
+                                 if(real_tempo_diff >= _tempoQuantizeAmount/2.0) // Anti-hysteresis
+                                 {
diff --git a/debian/patches/series b/debian/patches/series
index 8c5c69f..ec8eca6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001-buildsystem.patch
+1002-abs-errors.patch

-- 
muse packaging