[SCM] audacity/master: Add cherry-pick from upstream to fix FTBFS with gcc-6. (Closes: #811671)

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

The following commit has been merged in the master branch:
commit 80dd0d8019a97033dca76b328e056bf5c0662478
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Thu Jul 28 22:25:40 2016 +0200

    Add cherry-pick from upstream to fix FTBFS with gcc-6. (Closes: #811671)

diff --git a/debian/changelog b/debian/changelog
index 449e2b6..b36b2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+audacity (2.1.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add cherry-pick from upstream to fix FTBFS with gcc-6. (Closes: #811671)
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Thu, 28 Jul 2016 22:24:27 +0200
+
 audacity (2.1.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/60f23220.patch b/debian/patches/60f23220.patch
new file mode 100644
index 0000000..8d2afb2
--- /dev/null
+++ b/debian/patches/60f23220.patch
@@ -0,0 +1,54 @@
+From 60f2322055756e8cacfe96530a12c63e9694482c Mon Sep 17 00:00:00 2001
+From: Paul Licameli <paul.licameli at gmail.com>
+Date: Fri, 26 Feb 2016 14:45:09 -0500
+Subject: [PATCH] Fix warnings for returning false instead of null
+
+---
+ src/effects/vamp/LoadVamp.cpp | 2 +-
+ src/import/ImportFLAC.cpp     | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/effects/vamp/LoadVamp.cpp b/src/effects/vamp/LoadVamp.cpp
+index 2c73e1d..038a26f 100644
+--- a/src/effects/vamp/LoadVamp.cpp
++++ b/src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(const wxString & path,
+    Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
+    if (!vp)
+    {
+-      return false;
++      return nullptr;
+    }
+ 
+    // We limit the listed plugin outputs to those whose results can
+diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp
+index 2003456..84be299 100644
+--- a/src/import/ImportFLAC.cpp
++++ b/src/import/ImportFLAC.cpp
+@@ -299,7 +299,7 @@ ImportFileHandle *FLACImportPlugin::Open(const wxString &filename)
+    int cnt;
+    wxFile binaryFile;
+    if (!binaryFile.Open(filename)) {
+-      return false; // File not found
++      return nullptr; // File not found
+    }
+ 
+ #ifdef USE_LIBID3TAG
+@@ -316,7 +316,7 @@ ImportFileHandle *FLACImportPlugin::Open(const wxString &filename)
+ 
+    if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
+       // File is not a FLAC file
+-      return false;
++      return nullptr;
+    }
+ 
+    // Open the file for import
+@@ -325,7 +325,7 @@ ImportFileHandle *FLACImportPlugin::Open(const wxString &filename)
+    bool success = handle->Init();
+    if (!success) {
+       delete handle;
+-      return NULL;
++      return nullptr;
+    }
+ 
+    return handle;
diff --git a/debian/patches/series b/debian/patches/series
index 1e2657f..155dcac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-minsrc-autoreconf.patch
 workaround-wxwidgets-fit-recovery.patch
+60f23220.patch

-- 
Audacity debian packaging