[SCM] audacity/master: Replace patch with that from opensuse

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

The following commit has been merged in the master branch:
commit afd0f8bae81a902d2c1218fafc204b48e5d563b6
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Jul 29 09:21:06 2016 +0200

    Replace patch with that from opensuse

diff --git a/debian/changelog b/debian/changelog
index f5b8158..5599da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 audacity (2.1.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Add cherry-pick from upstream to fix FTBFS with gcc-6. (Closes: #811671)
+  * debian/patches:
+    - fix-gcc6-ftbfs.patch - Add to fix FTBFS with gcc-6. (Closes: #811671)
   * debian/control:
     - Bump Standards-Version to 3.9.8. (no changes needed)
   * debian/watch: Update to github.
diff --git a/debian/patches/60f23220.patch b/debian/patches/60f23220.patch
deleted file mode 100644
index 8d2afb2..0000000
--- a/debian/patches/60f23220.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/fix-gcc6-ftbfs.patch b/debian/patches/fix-gcc6-ftbfs.patch
new file mode 100644
index 0000000..e5e9148
--- /dev/null
+++ b/debian/patches/fix-gcc6-ftbfs.patch
@@ -0,0 +1,38 @@
+Description: Fix FTBFS with gcc-6
+Author: mliska at suse.cz
+
+Index: src/effects/vamp/LoadVamp.cpp
+===================================================================
+--- a/src/effects/vamp/LoadVamp.cpp.orig
++++ b/src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
+    Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
+    if (!vp)
+    {
+-      return false;
++      return 0;
+    }
+ 
+    // We limit the listed plugin outputs to those whose results can
+Index: src/import/ImportFLAC.cpp
+===================================================================
+--- a/src/import/ImportFLAC.cpp.orig
++++ b/src/import/ImportFLAC.cpp
+@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
+    int cnt;
+    wxFile binaryFile;
+    if (!binaryFile.Open(filename)) {
+-      return false; // File not found
++      return NULL; // File not found
+    }
+ 
+ #ifdef USE_LIBID3TAG
+@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
+ 
+    if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
+       // File is not a FLAC file
+-      return false;
++      return NULL;
+    }
+ 
+    // Open the file for import
diff --git a/debian/patches/series b/debian/patches/series
index 155dcac..391cdf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix-minsrc-autoreconf.patch
 workaround-wxwidgets-fit-recovery.patch
-60f23220.patch
+fix-gcc6-ftbfs.patch

-- 
Audacity debian packaging