From 8786fd6bfbec0fd126d9c146a7a0a25d3268962c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mar 29 2016 22:46:37 +0000
Subject: Add patch to fix gcc6 build issues (bug #1307335)


---

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@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.spec b/audacity.spec
index dcc6ba7..b3dbb47 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -6,7 +6,7 @@
 Name: audacity
 
 Version: 2.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -33,6 +33,10 @@ Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip
 # enable startup notification
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
 # Patch3: audacity-2.0.2-desktop.in.patch
+# Upstream commit to fix gcc compile issues
+# https://bugzilla.redhat.com/show_bug.cgi?id=1307335
+# https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c
+Patch1: audacity-60f2322055756e8cacfe96530a12c63e9694482c.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -82,6 +86,7 @@ For the most up to date manual content, use the on-line manual.
 
 %prep
 %setup -q -n %{tartopdir}
+%patch1 -p1 -b .gcc6
 
 # Substitute hardcoded library paths.
 # %#patch1 -b .libmp3lame-default
@@ -208,6 +213,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Mar 29 2016 Orion Poplawski <orion@cora.nwra.com> - 2.1.2-4
+- Add patch to fix gcc6 build issues (bug #1307335)
+
 * Thu Mar 03 2016 David Timms <iinet.net.au@dtimms> - 2.1.2-3
 - Rebuild for new soundtouch required to fix symbol lookup error.