[SCM] audacity/master: Removed, no longer needed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Aug 28 20:01:50 UTC 2017


The following commit has been merged in the master branch:
commit 2dd4c6842b41196506e81c0c0cd513470f3e5b29
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Aug 28 21:48:13 2017 +0200

    Removed, no longer needed

diff --git a/debian/patches/fix-gcc6-ftbfs.patch b/debian/patches/fix-gcc6-ftbfs.patch
deleted file mode 100644
index e5e9148..0000000
--- a/debian/patches/fix-gcc6-ftbfs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 391cdf1..1e2657f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-minsrc-autoreconf.patch
 workaround-wxwidgets-fit-recovery.patch
-fix-gcc6-ftbfs.patch

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list