[SCM] klick/master: Add patch to fix FTBFS with gcc-6.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d52e819272ba93fea513363dcc2d6819a29439d7
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jul 11 23:53:12 2016 +0200

    Add patch to fix FTBFS with gcc-6.

diff --git a/debian/patches/02-gcc_6.patch b/debian/patches/02-gcc_6.patch
new file mode 100644
index 0000000..e15d41c
--- /dev/null
+++ b/debian/patches/02-gcc_6.patch
@@ -0,0 +1,74 @@
+Index: klick/src/metronome_map.hh
+===================================================================
+--- klick.orig/src/metronome_map.hh
++++ klick/src/metronome_map.hh
+@@ -48,7 +48,7 @@ class MetronomeMap
+     virtual void timebase_callback(position_t *);
+ 
+   private:
+-    static double const TICKS_PER_BEAT = 1920.0;
++    static double constexpr TICKS_PER_BEAT = 1920.0;
+ 
+     // transport position
+     nframes_t _current;
+Index: klick/src/metronome_simple.hh
+===================================================================
+--- klick.orig/src/metronome_simple.hh
++++ klick/src/metronome_simple.hh
+@@ -59,8 +59,8 @@ class MetronomeSimple
+   private:
+ 
+     static int const MAX_TAPS = 5;
+-    static float const MAX_TAP_AGE = 3.0;
+-    static float const TAP_DIFF = 0.2;
++    static float constexpr MAX_TAP_AGE = 3.0;
++    static float constexpr TAP_DIFF = 0.2;
+ 
+     float _tempo;
+     float _tempo_increment, _tempo_start, _tempo_limit;
+Index: klick/src/tempomap.cc
+===================================================================
+--- klick.orig/src/tempomap.cc
++++ klick/src/tempomap.cc
+@@ -57,17 +57,17 @@ static char const regex_blank[] = "^[[:b
+ // matches any valid line in a tempomap file
+ static char const regex_valid[] =
+     // label
+-    "^[[:blank:]]*("REGEX_LABEL":)?" \
++    "^[[:blank:]]*(" REGEX_LABEL":)?" \
+     // bars
+-    "[[:blank:]]*"REGEX_INT"" \
++    "[[:blank:]]*" REGEX_INT"" \
+     // meter
+-    "([[:blank:]]+"REGEX_INT"/"REGEX_INT")?" \
++    "([[:blank:]]+" REGEX_INT"/" REGEX_INT")?" \
+     // tempo
+-    "[[:blank:]]+"REGEX_FLOAT"(-"REGEX_FLOAT"|((,"REGEX_FLOAT")*))?" \
++    "[[:blank:]]+" REGEX_FLOAT"(-" REGEX_FLOAT"|((," REGEX_FLOAT")*))?" \
+     // pattern
+-    "([[:blank:]]+"REGEX_PATTERN")?" \
++    "([[:blank:]]+" REGEX_PATTERN")?" \
+     // volume
+-    "([[:blank:]]+"REGEX_FLOAT")?" \
++    "([[:blank:]]+" REGEX_FLOAT")?" \
+     // comment
+     "[[:blank:]]*(#.*)?$";
+ 
+@@ -87,13 +87,13 @@ static int const
+ // matches valid tempo parameters on the command line
+ static char const regex_cmdline[] =
+     // bars
+-    "^[[:blank:]]*("REGEX_INT"[[:blank:]]+)?" \
++    "^[[:blank:]]*(" REGEX_INT"[[:blank:]]+)?" \
+     // meter
+-    "("REGEX_INT"/"REGEX_INT"[[:blank:]]+)?" \
++    "(" REGEX_INT"/" REGEX_INT"[[:blank:]]+)?" \
+     // tempo
+-    REGEX_FLOAT"(-"REGEX_FLOAT"/"REGEX_FLOAT")?" \
++    REGEX_FLOAT"(-" REGEX_FLOAT"/" REGEX_FLOAT")?" \
+     // pattern
+-    "([[:blank:]]+"REGEX_PATTERN")?[[:blank:]]*$";
++    "([[:blank:]]+" REGEX_PATTERN")?[[:blank:]]*$";
+ 
+ static int const
+     RE_NMATCHES_CMD = 15,
diff --git a/debian/patches/series b/debian/patches/series
index 104f568..6d6f396 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-hardening_fix.patch
+#02-gcc_6.patch

-- 
klick packaging