[audacity-freeworld/f24] Fix for gcc6

[Nicolas Chauvet]

commit a5e3b16a8c5aa94e1060344fdeddd8a212e1a0b8
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Wed Jun 22 14:10:47 2016 +0200

    Fix for gcc6

 ...-60f2322055756e8cacfe96530a12c63e9694482c.patch | 50 ++++++++++++++++++++++
 audacity-freeworld.spec                            |  7 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/audacity-60f2322055756e8cacfe96530a12c63e9694482c.patch b/audacity-60f2322055756e8cacfe96530a12c63e9694482c.patch
new file mode 100644
index 0000000..0cdede0
--- /dev/null
+++ b/audacity-60f2322055756e8cacfe96530a12c63e9694482c.patch
@@ -0,0 +1,50 @@
+commit 60f2322055756e8cacfe96530a12c63e9694482c
+Author: Paul Licameli <paul.licameli at gmail.com>
+Date:   Fri Feb 26 14:45:09 2016 -0500
+
+    Fix warnings for returning false instead of null
+
+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/audacity-freeworld.spec b/audacity-freeworld.spec
index 1a61fb8..35da385 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -6,7 +6,7 @@
 Name: audacity-freeworld
 
 Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -26,6 +26,7 @@ Source0: http://www.fosshub.com/Audacity/download/%{realname}-minsrc-%{version}.
 # manual can be installed from the base Fedora audacity package.
 #S#ource1: http://www.fosshub.com/Audacity.html/%{realname}-manual-%{version}.zip
 
+Patch1: audacity-60f2322055756e8cacfe96530a12c63e9694482c.patch
 # Patch1: audacity-2.0.4-libmp3lame-default.patch
 # Patch2: audacity-1.3.9-libdir.patch
 # add audio/x-flac
@@ -80,6 +81,7 @@ This build has support for mp3 and ffmpeg import/export.
 
 %prep
 %setup -q -n %{tartopdir}
+%patch1 -p1 -b .gcc6
 
 # Substitute hardcoded library paths.
 #patch1 -b .libmp3lame-default
@@ -211,6 +213,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Jun 22 2016 Nicolas Chauvet <kwizart at gmail.com> - 2.1.2-2
+- Backport fix for gcc6
+
 * Thu Mar 03 2016 Sérgio Basto <sergio at serjux.com> - 2.1.2-1
 - Update audacity to 2.1.2 final