[SCM] mixxx/master: debian/patches/: patchset updated

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 97e85fa831090d28f7a49f1ff9e4370cbaca7f7e
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Mon Jul 25 22:19:57 2016 +0200

    debian/patches/: patchset updated
    
    - 0007-fix_gcc6_issue.patch added
    
    Closes: #831071

diff --git a/debian/patches/0007-fix_gcc6_issue.patch b/debian/patches/0007-fix_gcc6_issue.patch
new file mode 100644
index 0000000..fb50f42
--- /dev/null
+++ b/debian/patches/0007-fix_gcc6_issue.patch
@@ -0,0 +1,33 @@
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Mon, 25 Jul 2016 22:17:43 +0200
+Subject: fix_gcc6_issue
+
+---
+ src/util/math.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/math.h b/src/util/math.h
+index 018335e..85971d1 100644
+--- a/src/util/math.h
++++ b/src/util/math.h
+@@ -3,8 +3,20 @@
+ 
+ // Causes MSVC to define M_PI and friends.
+ // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
++// Our SConscript defines this but check anyway.
++#ifdef __WINDOWS__
++#ifndef _USE_MATH_DEFINES
+ #define _USE_MATH_DEFINES
++#endif
++#endif
++
++#include <math.h>
+ #include <cmath>
++// Note: Because of our fpclassify hack, we actualy need to inlude both,
++// the c and the c++ version of the math header.
++// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included
++// after our fpclassify hack
++
+ #include <algorithm>
+ 
+ #include "util/assert.h"
diff --git a/debian/patches/series b/debian/patches/series
index 03bf391..bef0e81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 1001-buildsystem.patch
 0005-hidapi.patch
 0006-opengles.patch
+0007-fix_gcc6_issue.patch

-- 
mixxx packaging