Update to upstream version 2.3.3

PR:		242169
Submitted by:	xxjack12xx@gmail.com (maintainer)
MFH:		2019Q4 (hat: ports-secteam)

10 files changed, 16 insertions, 29 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index db4012b0362b..2528d8ca949a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 DISTVERSIONPREFIX=	Audacity-
-PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	xxjack12xx@gmail.com
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 31383826975a..fbf69438c5bc 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557793254
-SHA256 (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = cc477a71ff5571c72887a7a155365b07a1a50bcea1abf490a4de7b884376c731
-SIZE (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = 61972597
+TIMESTAMP = 1574484432
+SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 9ab6c8989e21165b86aad80b7e6691015cb5b0c91ab77e6170d7192f840313a8
+SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62099027
diff --git a/audio/audacity/files/patch-configure.ac b/audio/audacity/files/patch-configure.ac
index 55b13b364147..13e016ac3622 100644
--- a/audio/audacity/files/patch-configure.ac
+++ b/audio/audacity/files/patch-configure.ac
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2019-02-24 08:28:05 UTC
 +++ configure.ac
-@@ -204,14 +204,6 @@ if test x$enable_universal_binary = xyes; then
+@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
     esac
  fi
  
@@ -15,7 +15,7 @@
  if test x$enable_sse = xyes; then
  
     if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
-@@ -243,20 +235,7 @@ dnl check if alloca.h exists. If it does, we need to i
+@@ -239,20 +231,7 @@ dnl check if alloca.h exists. If it does, we need to i
  dnl Solaris builds, by defining HAVE_ALLOCA_H
  AC_CHECK_HEADERS_ONCE(alloca.h)
  
diff --git a/audio/audacity/files/patch-include_audacity_Types.h b/audio/audacity/files/patch-include_audacity_Types.h
index 99ac4102d1f3..20d5f4a9817b 100644
--- a/audio/audacity/files/patch-include_audacity_Types.h
+++ b/audio/audacity/files/patch-include_audacity_Types.h
@@ -1,6 +1,6 @@
 --- include/audacity/Types.h.orig	2018-10-01 14:07:33 UTC
 +++ include/audacity/Types.h
-@@ -100,7 +100,7 @@ class sampleCount (public)
+@@ -311,7 +311,7 @@ class sampleCount (public)
     sampleCount ( long v ) : value { v } {}
  
     // unsigned long is 64 bit on some platforms.  Let it narrow.
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
index 9bebf61dd0e7..785a38736c2a 100644
--- a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
@@ -1,6 +1,6 @@
 --- lib-src/FileDialog/Makefile.am.orig	2018-10-01 14:07:33 UTC
 +++ lib-src/FileDialog/Makefile.am
-@@ -1,5 +1,7 @@
+@@ -2,5 +2,7 @@
  ACLOCAL_AMFLAGS = -I m4
  
 +SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
@@ -8,7 +8,7 @@
  lib_LTLIBRARIES = libFileDialog.la
  
  libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
-@@ -8,22 +10,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
+@@ -11,22 +13,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
  libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
  
  if GTK
diff --git a/audio/audacity/files/patch-src_AudioIO.cpp b/audio/audacity/files/patch-src_AudioIO.cpp
index 4ac0d33ec87c..ea9211797476 100644
--- a/audio/audacity/files/patch-src_AudioIO.cpp
+++ b/audio/audacity/files/patch-src_AudioIO.cpp
@@ -1,14 +1,14 @@
 --- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
 +++ src/AudioIO.cpp
-@@ -479,7 +479,6 @@ TimeTrack and AudioIOListener and whether the playback
+@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
-    #include "../lib-src/portmidi/pm_common/portmidi.h"
+ //   #include "../lib-src/portmidi/pm_common/portmidi.h"
 -   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
     #include "NoteTrack.h"
  #endif
  
-@@ -799,13 +800,22 @@ struct AudioIO::ScrubState (private)
+@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)
  // return the system time as a double
  static double streamStartTime = 0; // bias system time to small number
  
diff --git a/audio/audacity/files/patch-src_FFmpeg.h b/audio/audacity/files/patch-src_FFmpeg.h
index 1c2db2bfbb69..ab1b2088aad3 100644
--- a/audio/audacity/files/patch-src_FFmpeg.h
+++ b/audio/audacity/files/patch-src_FFmpeg.h
@@ -1,6 +1,6 @@
 --- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
 +++ src/FFmpeg.h
-@@ -671,7 +671,7 @@ extern "C" {
+@@ -667,7 +667,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVOutputFormat*,
        av_oformat_next,
@@ -9,7 +9,7 @@
        (f)
     );
  #endif
-@@ -752,7 +752,7 @@ extern "C" {
+@@ -748,7 +748,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        int,
        av_fifo_size,
@@ -18,7 +18,7 @@
        (f)
     );
  #endif
-@@ -814,7 +814,7 @@ extern "C" {
+@@ -810,7 +810,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVDictionaryEntry *,
        av_dict_get,
diff --git a/audio/audacity/files/patch-src_MemoryX.h b/audio/audacity/files/patch-src_MemoryX.h
deleted file mode 100644
index 05c3267f4411..000000000000
--- a/audio/audacity/files/patch-src_MemoryX.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/MemoryX.h.orig	2019-03-09 11:55:09 UTC
-+++ src/MemoryX.h
-@@ -641,7 +641,7 @@ make_iterator_range( const Container &container )
- // For using std::unordered_map on wxString
- namespace std
- {
--   template<typename T> struct hash;
-+   //template<typename T> struct hash;
-    template<> struct hash< wxString > {
-       size_t operator () (const wxString &str) const // noexcept
-       {
diff --git a/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp b/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp
index 815ede5f3925..8e2ac16493f3 100644
--- a/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp
+++ b/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp
@@ -1,6 +1,6 @@
 --- src/prefs/PrefsDialog.cpp.orig	2019-05-13 18:00:33.704997000 -0700
 +++ src/prefs/PrefsDialog.cpp	2019-05-13 17:52:51.702814000 -0700
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  #include <wx/intl.h>
  #include <wx/listbox.h>
  #include <wx/sizer.h>
diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist
index 7a6f400825c3..d74b5bdf9f72 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -80,7 +80,6 @@ share/applications/audacity.desktop
 %%DATADIR%%/plug-ins/sample-data-import.ny
 %%DATADIR%%/plug-ins/tremolo.ny
 %%DATADIR%%/plug-ins/vocalrediso.ny
-%%DATADIR%%/plug-ins/vocalremover.ny
 %%DATADIR%%/plug-ins/vocoder.ny
 share/icons/hicolor/16x16/apps/audacity.png
 share/icons/hicolor/22x22/apps/audacity.png