From bbafca7130f0b4cc05bab96dae4d6a15cfd93d76 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 18 Mar 2017 19:03:47 +0100
Subject: [PATCH] audacity: update to 2.1.3.

---
 srcpkgs/audacity/patches/fix-musl.patch       | 14 -------------
 .../audacity/patches/fix-return_null.patch    | 20 -------------------
 srcpkgs/audacity/patches/fix-vamp-build.patch | 11 ----------
 srcpkgs/audacity/template                     |  8 ++++----
 4 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/audacity/patches/fix-musl.patch
 delete mode 100644 srcpkgs/audacity/patches/fix-return_null.patch
 delete mode 100644 srcpkgs/audacity/patches/fix-vamp-build.patch

diff --git a/srcpkgs/audacity/patches/fix-musl.patch b/srcpkgs/audacity/patches/fix-musl.patch
deleted file mode 100644
index b078de3d341..00000000000
--- a/srcpkgs/audacity/patches/fix-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/effects/VST/VSTEffect.cpp.orig	2015-10-21 14:25:52.942716426 -0400
-+++ ./src/effects/VST/VSTEffect.cpp	2015-10-21 14:28:45.521711160 -0400
-@@ -2576,6 +2576,11 @@
-    // symbols.
-    //
-    // Once we define a proper external API, the flags can be removed.
-+
-+#ifndef RTLD_DEEPBIND
-+#define RTLD_DEEPBIND 0
-+#endif
-+
-    void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
-    if (!lib) 
-    {
diff --git a/srcpkgs/audacity/patches/fix-return_null.patch b/srcpkgs/audacity/patches/fix-return_null.patch
deleted file mode 100644
index 158117cd267..00000000000
--- a/srcpkgs/audacity/patches/fix-return_null.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/import/ImportFLAC.cpp	2016-01-08 23:05:48.000000000 +0100
-+++ src/import/ImportFLAC.cpp	2016-10-14 22:19:44.434290227 +0200
-@@ -296,7 +296,7 @@
-    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 @@
- 
-    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/srcpkgs/audacity/patches/fix-vamp-build.patch b/srcpkgs/audacity/patches/fix-vamp-build.patch
deleted file mode 100644
index 8bf946dbb04..00000000000
--- a/srcpkgs/audacity/patches/fix-vamp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/effects/vamp/LoadVamp.cpp.orig
-+++ 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
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 3c613efc03e..9b812786763 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,7 +1,7 @@
 # Template file for 'audacity'
 pkgname=audacity
-version=2.1.2
-revision=3
+version=2.1.3
+revision=1
 wrksrc="${pkgname}-Audacity-${version}"
 build_style=gnu-configure
 configure_args="--with-libsamplerate"
@@ -11,11 +11,11 @@ makedepends="jack-devel wxWidgets-devel gtk+-devel expat-devel
  vamp-plugin-sdk-devel lame-devel libid3tag-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Graphical cross-platform audio editor"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"
 homepage="http://audacityteam.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/Audacity-${version}.tar.gz"
-checksum=90007b50cdc3885607b1afef2f158777a61c1658e869a88ec4d98c59c133f9bd
+checksum=cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;