<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3051359ae88d4198c492d84925de6b1e451e8aab">https://github.com/macports/macports-ports/commit/3051359ae88d4198c492d84925de6b1e451e8aab</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3051359 port:audacity{,-devel}: upgrade to 2.2.2/2.2.2.336
</span>3051359 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3051359ae88d4198c492d84925de6b1e451e8aab
</span>Author: R.J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Mar 11 23:22:25 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> port:audacity{,-devel}: upgrade to 2.2.2/2.2.2.336
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #1415
</span>---
audio/audacity/Portfile | 70 +++++++++++++---------
.../files/FFmpeg_build_against_ffmpeg.diff | 68 ---------------------
audio/audacity/files/add_enGB_translation.diff | 26 ++++----
audio/audacity/files/add_missing_newline.diff | 9 ---
audio/audacity/files/audacity.sh | 3 -
.../files/buildinfo-clarify-no-gstreamer.diff | 2 +-
.../files/devel/patch-unordered_map-fixes.diff | 26 ++++++++
.../audacity/files/{ => devel}/patch-wxw-31x.diff | 23 ++++++-
audio/audacity/files/fix-minsrc-autoreconf.patch | 2 +-
audio/audacity/files/patch-add-MenusMac.diff | 24 ++++----
.../files/patch-avoid-clang-choke-on-confbase.diff | 13 ----
audio/audacity/files/patch-fix-audiounits.diff | 24 ++++----
audio/audacity/files/patch-fix-casts.diff | 4 +-
.../files/patch-implement-progdial=beep.diff | 29 +++++++++
.../files/patch-libnyquist-symbol-visibility.diff | 6 +-
.../files/patch-more-decent-font-sizes.diff | 12 ++--
audio/audacity/files/patch-no-rtld_deepbind.diff | 11 ----
audio/audacity/files/patch-temp-fixes.diff | 7 ++-
.../audacity/files/patch-unordered_map-fixes.diff | 13 ++++
audio/audacity/files/patch-vstcontrolosx.diff | 2 +-
audio/audacity/files/patch-wxw-303.diff | 8 +--
audio/audacity/files/src-Makefile-for-osx.diff | 8 +--
22 files changed, 195 insertions(+), 195 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/Portfile b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9998953..528a16f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span> PortGroup github 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,33 +22,39 @@ long_description Audacity is a free, easy-to-use, multi-track audio editor an
</span> Numerous effects including change the speed or pitch of a recording. \n\
And more!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport audacity-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport audacity-devel {
</span> long_description A port of the Audacity audio editor aimed at development purposes.
}
if {${subport} eq "${name}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the release tarball from github because it contains all required external libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get the source tarball from github because it contains all required external libs
</span> # incl. those not in MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 2.2.0 Audacity-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname Audacity-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1404ebe51fd7e9503081ba5f471260c68760b3f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 921e527a8e52516f208f8cfe34fa61238c470fd16f2c96839a8d29f41dc0b4f6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity 2.2.2 Audacity-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c48e8467fc06c1ffb11af2b0fba4ede77b66ee2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7963cedab841aff181ea25b06991ba5ba56249533815ba5cdd82ec1282dbadd8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25941576
</span> set PPREFIX ./
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "archive/Audacity-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # git describe --tags : Audacity-2.2.0-1-gfd3813f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity fd3813fa30e4f733ea4e1c86bb5cb986c34b5e3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # git describe --tags : Audacity-2.2.2-336-g49eb7ddb6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity 49eb7ddb61cf7d2d9468932ac340550ef48a8828
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.2.336
</span> # this port is intended to facilitate development efforts shared with "upstreams"
# so using git instead of a tarball fetch type is more appropriate.
fetch.type git
distname audacity-git
set PPREFIX devel/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant wx32 description {Use wxWidgets 3.2 - experimental!} {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # register the exact source version in the build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/mac "scripts/get_gitident.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
categories audio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,19 +69,14 @@ use_parallel_build yes
</span>
homepage http://www.audacityteam.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {*gcc-[234].[0-8]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[variant_exists wx32] && [variant_isset wx32]} {
# we want to use the wxWidgets-3.2 "bleeding edge" port!
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-wxw-31x.diff
</span> } else {
wxWidgets.use wxWidgets-3.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${wxWidgets.port}
</span>
if {![catch {set wxw_stdlib [active_variants ${wxWidgets.port} stdlib]} err]} {
if {${wxw_stdlib}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +95,8 @@ depends_build-append \
</span> depends_lib-append port:expat \
path:lib/libavcodec.dylib:ffmpeg \
port:flac \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:harfbuzz \
</span> port:lame \
port:libid3tag \
port:libmad \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +122,6 @@ platform darwin {
</span> portaudio-no-universal-build.diff \
buildinfo-clarify-no-gstreamer.diff \
add_enGB_translation.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-avoid-clang-choke-on-confbase.diff \
</span> patch-more-decent-font-sizes.diff \
patch-python.diff \
patch-vstcontrolosx.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,11 +129,22 @@ platform darwin {
</span> patch-fix-casts.diff \
patch-add-MenusMac.diff \
patch-skip-gcc-version-test.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-audiounits.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for building against wxWidgets 3.0.3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # reported upstream, patch accepted as the proper fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for building against wxWidgets 3.0.3 and up:
</span> patchfiles-append \
patch-wxw-303.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # work around a missing implementation in wxCocoa's wxSound class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,6 +192,11 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# quelch a huge number of warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-inconsistent-missing-override \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-overloaded-virtual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--disable-dependency-tracking \
--disable-quicktime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,14 +218,12 @@ configure.args-append \
</span> --with-soundtouch \
--with-twolame \
--with-widgetextra=local \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-portmidi=system \
</span> CPPFLAGS=-I${prefix}/include \
WX_CONFIG=${wxWidgets.wxconfig}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The embedded portmidi is linux-only as of v2.2.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# building against the system portaudio leads to missing symbols due to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# mismatched symbol visibility which I haven't managed to address.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since version 2.2.0 we need to use the embedded (modified) Portaudio version.
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-portmidi=system \
</span> --with-portaudio=local
configure.env-append \
PORTMIDI_CFLAGS=-I${prefix}/include \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/FFmpeg_build_against_ffmpeg.diff b/audio/audacity/files/FFmpeg_build_against_ffmpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0e57ead..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/FFmpeg_build_against_ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -686,12 +686,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVFormatContext *s, AVDictionary **options),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (s, options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(IS_FFMPEG_PROJECT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVOutputFormat*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_oformat_next,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (const AVOutputFormat *f),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVOutputFormat*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_oformat_next,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVOutputFormat *f),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVCodec*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_codec_next,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -753,12 +762,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVFifoBuffer *f),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(IS_FFMPEG_PROJECT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_fifo_size,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (const AVFifoBuffer *f),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_fifo_size,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVFifoBuffer *f),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_malloc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -799,12 +817,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVFifoBuffer *f, unsigned int size),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (f, size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(IS_FFMPEG_PROJECT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVDictionaryEntry *,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_dict_get,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (m, key, prev, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVDictionaryEntry *,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_dict_get,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (m, key, prev, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFMPEG_FUNCTION_WITH_RETURN(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_dict_set,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/add_enGB_translation.diff b/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 86bbab0..1d0f267 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git a/locale/LINGUAS b/locale/LINGUAS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 94a70ac..8dd7b7e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cb63b55f53f4201b23dea97eb8eb40294266bca4..f8170c2cb2f2af793f17d67b5260aff0addca4b1 100644
</span> --- a/locale/LINGUAS
+++ b/locale/LINGUAS
@@ -11,6 +11,7 @@ cy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ index 94a70ac..8dd7b7e 100644
</span> +en_GB
es
eu
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eu_ES
</span> diff --git a/locale/en_GB.po b/locale/en_GB.po
new file mode 100644
index 0000000..26c4d89
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12844,16 +12844,16 @@ index 0000000..26c4d89
</span> +#~ msgid "Normalizing..."
+#~ msgstr "Normalising..."
diff --git a/src/Languages.cpp b/src/Languages.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7f0deca..12cc487 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 88d0d9ff6db320b04c5e8337f3965272750248e4..d173484382012f25198108ac7829f8c395694baf 100644
</span> --- a/src/Languages.cpp
+++ b/src/Languages.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +116,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("da")] = wxT("Dansk");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("de")] = wxT("Deutsch");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("el")] = wxT("Ellinika");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- localLanguageName[wxT("en")] = wxT("English");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ localLanguageName[wxT("en")] = wxT("US English");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ localLanguageName[wxT("en_GB")] = wxT("British English");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("es")] = wxT("Espanol");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("eu")] = wxT("Euskara");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localLanguageName[wxT("fa")] = wxT("Farsi");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "da Dansk",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "de Deutsch",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "el \316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"en English",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"en US English",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"en_GB British English",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "es Espa\303\261ol",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "eu Euskara",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "eu_ES Euskara (Espainiako)",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/add_missing_newline.diff b/audio/audacity/files/add_missing_newline.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 96cd90a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/add_missing_newline.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/portaudio-v19/test/patest_mono.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/portaudio-v19/test/patest_mono.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,4 +152,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf( stderr, "Error number: %d\n", err );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/audacity.sh b/audio/audacity/files/audacity.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 16958b8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/audacity.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec @AUD_APP_PATH@/Contents/MacOS/Audacity "$@"
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff b/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fc0a42..4904e02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
</span> index fe789d6..21d32ad 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,7 +529,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -520,7 +520,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
</span> #ifdef USE_GSTREAMER
AddBuildinfoRow(&informationStr, wxT("gstreamer"), _("Import via GStreamer"), enabled);
#else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-unordered_map-fixes.diff b/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec2db2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1177,7 +1179,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace tr1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7668506f2698240a1efbace1521401040a7396e4..7fae64ec06a48ce4ae7b77c2489a17ed0e2d89da 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace tr1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> struct hash< NormalizedKeyString > {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t operator () (const NormalizedKeyString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-wxw-31x.diff b/audio/audacity/files/devel/patch-wxw-31x.diff
</span>similarity index 72%
rename from audio/audacity/files/patch-wxw-31x.diff
rename to audio/audacity/files/devel/patch-wxw-31x.diff
<span style='display:block; white-space:pre;color:#808080;'>index 7df7db6..24452ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/ma
</span> index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..fca75e17da856475cb602d8d5040bcffce2fa7d5 100644
--- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span> // implementation
// ============================================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,3 +37,24 @@ index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..fca75e17da856475cb602d8d5040bcff
</span> {
FileDialog* _dialog;
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..6f8694ed9f5dbfceea34474d7c05ccfc7fa84506 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1172,7 +1172,7 @@ make_value_transform_iterator(const Iterator &iterator, Function function)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return { iterator, NewFunction{ function } };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*// For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1191,6 +1191,6 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // __AUDACITY_MEMORY_X_H__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/fix-minsrc-autoreconf.patch b/audio/audacity/files/fix-minsrc-autoreconf.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c20fa90..76bbd48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/fix-minsrc-autoreconf.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/fix-minsrc-autoreconf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ Author: Benjamin Drung <bdrung@debian.org>
</span>
--- a/lib-src/Makefile.am
+++ b/lib-src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,7 @@ SUBDIRS += lib-widget-extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +180,7 @@ SUBDIRS += lib-widget-extra
</span> endif
# Note: These optional libraries will not be distributed in the source tarball.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-add-MenusMac.diff b/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d27b0e7..c5abffe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span> diff --git a/locale/POTFILES.in b/locale/POTFILES.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8530e380f8c6b3ac7da38057c397857294095b66..8ddab9d9ae232ed6f22d3f0fcc705d21a1a33d05 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dd2787b01..c0f037c5a 100644
</span> --- a/locale/POTFILES.in
+++ b/locale/POTFILES.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,7 @@ src/LyricsWindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Matrix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,7 @@ src/MemoryX.h
</span> src/Menus.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Menus.h
</span> src/MenusMac.cpp
+src/MenusMac.mm
src/Mix.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Mix.h
</span> src/MixerBoard.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/ModuleManager.cpp
</span> diff --git a/src/Makefile.am b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b2c792f..732a69c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e61be0e4e..14fa52ff3 100644
</span> --- a/src/Makefile.am
+++ b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,6 +175,7 @@ audacity_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,6 +177,7 @@ audacity_SOURCES = \
</span> MemoryX.h \
Menus.cpp \
Menus.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,10 @@ index b2c792f..732a69c 100644
</span> Mix.h \
MixerBoard.cpp \
diff --git a/src/Makefile.in b/src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0d4e3e7..f6f34d2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d28e7abc1..d6914ed13 100644
</span> --- a/src/Makefile.in
+++ b/src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,7 +309,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,7 +300,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
</span> LabelDialog.h LabelTrack.cpp LabelTrack.h LangChoice.cpp \
LangChoice.h Languages.cpp Languages.h Legacy.cpp Legacy.h \
Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ index 0d4e3e7..f6f34d2 100644
</span> Mix.cpp Mix.h MixerBoard.cpp MixerBoard.h ModuleManager.cpp \
ModuleManager.h NumberScale.h PitchName.cpp PitchName.h \
PlatformCompatibility.cpp PlatformCompatibility.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -633,7 +633,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -627,7 +627,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \
</span> audacity-LangChoice.$(OBJEXT) audacity-Languages.$(OBJEXT) \
audacity-Legacy.$(OBJEXT) audacity-Lyrics.$(OBJEXT) \
audacity-LyricsWindow.$(OBJEXT) audacity-Matrix.$(OBJEXT) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ index 0d4e3e7..f6f34d2 100644
</span> audacity-MixerBoard.$(OBJEXT) audacity-ModuleManager.$(OBJEXT) \
audacity-PitchName.$(OBJEXT) \
audacity-PlatformCompatibility.$(OBJEXT) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1324,7 +1325,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1322,7 +1322,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
</span> LabelDialog.h LabelTrack.cpp LabelTrack.h LangChoice.cpp \
LangChoice.h Languages.cpp Languages.h Legacy.cpp Legacy.h \
Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ index 0d4e3e7..f6f34d2 100644
</span> Mix.cpp Mix.h MixerBoard.cpp MixerBoard.h ModuleManager.cpp \
ModuleManager.h NumberScale.h PitchName.cpp PitchName.h \
PlatformCompatibility.cpp PlatformCompatibility.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2421,6 +2422,7 @@ distclean-compile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2438,6 +2438,7 @@ distclean-compile:
</span> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-LyricsWindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Matrix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Menus.Po@am__quote@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ index 0d4e3e7..f6f34d2 100644
</span> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Mix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-MixerBoard.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ModuleManager.Po@am__quote@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3600,6 +3602,20 @@ audacity-Menus.obj: Menus.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3624,6 +3625,20 @@ audacity-Menus.obj: Menus.cpp
</span> @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o audacity-Menus.obj `if test -f 'Menus.cpp'; then $(CYGPATH_W) 'Menus.cpp'; else $(CYGPATH_W) '$(srcdir)/Menus.cpp'; fi`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff b/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e9d394a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66ed25b..11a9e24 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +63,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../AllThemeResources.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../AudioIO.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../ImageManipulation.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// hack to deactivate a bit in wx/confbase.h on which clang chokes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __VMS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../Prefs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../Project.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../Theme.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-fix-audiounits.diff b/audio/audacity/files/patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 671a7c1..809b52d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/configure b/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2b3ef6b..694a46f 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1f1e3347b..fe10404fb 100755
</span> --- a/configure
+++ b/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23643,7 +23643,7 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23814,7 +23814,7 @@ esac
</span> case "${host_os}" in
darwin* | rhapsody*)
LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ index 2b3ef6b..694a46f 100755
</span> cygwin*)
;;
diff --git a/src/Makefile.am b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index eb77b29..b2c792f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e61be0e4e..cd0b45fd7 100644
</span> --- a/src/Makefile.am
+++ b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -609,6 +609,8 @@ audacity_LDADD += $(AUDIOUNITS_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -710,6 +710,8 @@ audacity_LDADD += $(AUDIOUNITS_LIBS)
</span> audacity_SOURCES += \
effects/audiounits/AudioUnitEffect.cpp \
effects/audiounits/AudioUnitEffect.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ index eb77b29..b2c792f 100644
</span> endif
diff --git a/src/Makefile.in b/src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6526bb..0d4e3e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d28e7abc1..6fa29336d 100644
</span> --- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -85,6 +85,8 @@ bin_PROGRAMS = audacity$(EXEEXT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ index d6526bb..0d4e3e7 100644
</span> @USE_AUDIO_UNITS_TRUE@ $(NULL)
@USE_FFMPEG_TRUE@am__append_4 = $(FFMPEG_CFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -478,7 +480,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -549,7 +551,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
</span> widgets/wxPanelWrapper.h xml/XMLFileReader.cpp \
xml/XMLFileReader.h xml/XMLWriter.cpp xml/XMLWriter.h \
effects/audiounits/AudioUnitEffect.cpp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ index d6526bb..0d4e3e7 100644
</span> export/ExportFFmpeg.h export/ExportFFmpegDialogs.cpp \
export/ExportFFmpegDialogs.h import/ImportFFmpeg.cpp \
import/ImportFFmpeg.h import/ImportGStreamer.cpp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -510,7 +513,8 @@ am__objects_1 = audacity-BlockFile.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,7 +584,8 @@ am__objects_1 = audacity-BlockFile.$(OBJEXT) \
</span> blockfile/audacity-SilentBlockFile.$(OBJEXT) \
blockfile/audacity-SimpleBlockFile.$(OBJEXT) \
xml/audacity-XMLTagHandler.$(OBJEXT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ index d6526bb..0d4e3e7 100644
</span> @USE_FFMPEG_TRUE@am__objects_3 = \
@USE_FFMPEG_TRUE@ export/audacity-ExportFFmpeg.$(OBJEXT) \
@USE_FFMPEG_TRUE@ export/audacity-ExportFFmpegDialogs.$(OBJEXT) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1953,6 +1957,9 @@ effects/audiounits/$(DEPDIR)/$(am__dirstamp):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2294,6 +2298,9 @@ effects/audiounits/$(DEPDIR)/$(am__dirstamp):
</span> effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT): \
effects/audiounits/$(am__dirstamp) \
effects/audiounits/$(DEPDIR)/$(am__dirstamp)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ index d6526bb..0d4e3e7 100644
</span> export/audacity-ExportFFmpeg.$(OBJEXT): export/$(am__dirstamp) \
export/$(DEPDIR)/$(am__dirstamp)
export/audacity-ExportFFmpegDialogs.$(OBJEXT): export/$(am__dirstamp) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2232,6 +2239,7 @@ distclean-compile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2590,6 +2597,7 @@ distclean-compile:
</span> @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Wahwah.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTEffect.Po@am__quote@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ index d6526bb..0d4e3e7 100644
</span> @AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AudioUnitEffect.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@effects/lv2/$(DEPDIR)/audacity-LV2Effect.Po@am__quote@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6084,6 +6092,20 @@ effects/audiounits/audacity-AudioUnitEffect.obj: effects/audiounits/AudioUnitEff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7195,6 +7203,20 @@ effects/audiounits/audacity-AudioUnitEffect.obj: effects/audiounits/AudioUnitEff
</span> @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AudioUnitEffect.obj `if test -f 'effects/audiounits/AudioUnitEffect.cpp'; then $(CYGPATH_W) 'effects/audiounits/AudioUnitEffect.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AudioUnitEffect.cpp'; fi`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,10 +97,10 @@ index d6526bb..0d4e3e7 100644
</span> @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT export/audacity-ExportFFmpeg.o -MD -MP -MF export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo -c -o export/audacity-ExportFFmpeg.o `test -f 'export/ExportFFmpeg.cpp' || echo '$(srcdir)/'`export/ExportFFmpeg.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo export/$(DEPDIR)/audacity-ExportFFmpeg.Po
diff --git a/src/effects/audiounits/AUControl.mm b/src/effects/audiounits/AUControl.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index babdd68..75e7531 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9e2198384..2164fe223 100644
</span> --- a/src/effects/audiounits/AUControl.mm
+++ b/src/effects/audiounits/AUControl.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,23 +165,31 @@ bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,23 +173,31 @@ bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo
</span> #endif
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-fix-casts.diff b/audio/audacity/files/patch-fix-casts.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 040ae58..7a165dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-fix-casts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-fix-casts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 340afa4..e54f68c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3cd95bd1c339ea1a744849562f387161d8be3ea2..b69547e22e6444c676c3eca98754139743da7183 100644
</span> --- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1063,7 +1063,9 @@ void VSTEffect::BundleDeleter::operator() (void* p) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1110,7 +1110,9 @@ void VSTEffect::BundleDeleter::operator() (void* p) const
</span> void VSTEffect::ResourceDeleter::operator() (void *p) const
{
if (mpHandle) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-implement-progdial=beep.diff b/audio/audacity/files/patch-implement-progdial=beep.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c89eb77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c81c69b9598948534b2dfbd2258103e37337a58c..59a05e5ff71eb8b305a97e8d6662bd2228d59b42 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/widgets/ProgressDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/widgets/ProgressDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +53,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../Prefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../Internat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __WXOSX_COCOA__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" void NSBeep(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This really should be a Preferences setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const unsigned char beep[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1595,7 +1599,13 @@ void ProgressDialog::Beep() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name.IsEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __WXOSX_COCOA__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // wxSound::Create(size_t,const void*) isn't implemented;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // use the system beep function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSBeep();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s.Create(sizeof(beep), beep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-libnyquist-symbol-visibility.diff b/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b09221..c65f155 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,22 +31,20 @@ diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c b/lib-src/libnyquist
</span> index 7fd9ac6..80ebdbf 100644
--- a/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,8 @@ LVAL xslider_read(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@ LVAL xslider_read(void)
</span> int index = getfixnum(arg);
xllastarg();
if (index >= 0 && index < SLIDERS_MAX) {
- return cvflonum(slider_array[index]);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+// return cvflonum(slider_array[index]);
</span> + return cvflonum(get_slider(index));
}
return NIL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +92,8 @@ void slider__fetch(snd_susp_type a_susp, snd_list_type snd_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@ void slider__fetch(snd_susp_type a_susp, snd_list_type snd_list)
</span> }
n = togo;
- c_reg = slider_array[susp->index];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+// c_reg = slider_array[susp->index];
</span> + c_reg = get_slider(susp->index);
out_ptr_reg = out_ptr;
if (n) do { /* the inner sample computation loop */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-more-decent-font-sizes.diff b/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e633d2f..be0edfd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0afafb6..38081bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 085caa441..31ee03972 100644
</span> --- a/src/widgets/NumericTextCtrl.cpp
+++ b/src/widgets/NumericTextCtrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1184,8 +1184,8 @@ NumericTextCtrl::NumericTextCtrl(NumericConverter::Type type,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1258,8 +1258,8 @@ NumericTextCtrl::NumericTextCtrl(wxWindow *parent, wxWindowID id,
</span> {
mAllowInvalidValue = false;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,13 +11,13 @@ index 0afafb6..38081bd 100644
</span> + mDigitBoxW = 8;
+ mDigitBoxH = 14;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mReadOnly = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mMenuEnabled = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mReadOnly = options.readOnly;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mMenuEnabled = options.menuEnabled;
</span> diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index eab3a30..7df49cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3895bfe36..5860d3ee4 100644
</span> --- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -968,10 +968,10 @@ void Ruler::Update(const TimeTrack* timetrack)// Envelope *speedEnv, long minSpe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1009,10 +1009,10 @@ void Ruler::Update(const TimeTrack* timetrack)// Envelope *speedEnv, long minSpe
</span> int desiredPixelHeight;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-no-rtld_deepbind.diff b/audio/audacity/files/patch-no-rtld_deepbind.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4d17b0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-no-rtld_deepbind.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/effects/VST/VSTEffect.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/effects/VST/VSTEffect.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2129,7 +2129,7 @@ bool VSTEffect::Load()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // symbols.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Once we define a proper external API, the flags can be removed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-temp-fixes.diff b/audio/audacity/files/patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 57233d2..fdfa3c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,13 @@
</span> diff --git a/src/MemoryX.h b/src/MemoryX.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1eb296e307141305018799636edd9ad1fee89159..df809bc79c08aff4a2930d88c021f09e337d0067 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span> --- a/src/MemoryX.h
+++ b/src/MemoryX.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,8 @@
</span>
// C++ standard header <memory> with a few extensions
#include <memory>
+#include <stdlib.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> #ifndef safenew
#define safenew new
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-unordered_map-fixes.diff b/audio/audacity/files/patch-unordered_map-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c5a35ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1177,7 +1179,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace tr1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-vstcontrolosx.diff b/audio/audacity/files/patch-vstcontrolosx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 85ac616..28246e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-vstcontrolosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-vstcontrolosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/src/effects/VST/VSTControlOSX.mm b/src/effects/VST/VSTControlOSX.mm
</span> index 3f289ad..879f2e0 100644
--- a/src/effects/VST/VSTControlOSX.mm
+++ b/src/effects/VST/VSTControlOSX.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,9 +102,13 @@ bool VSTControl::Create(wxWindow *parent, VSTEffectLink *link)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,9 +107,13 @@ bool VSTControl::Create(wxWindow *parent, VSTEffectLink *link)
</span> {
CreateCarbon();
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-wxw-303.diff b/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1fc325..d0f5203 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/ma
</span> index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..a9429f90f5418035152b678108dd7a97c9158653 100644
--- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,7 +141,9 @@ void FileDialog::Init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,7 +143,9 @@ void FileDialog::Init()
</span> {
m_filterIndex = -1;
m_delegate = nil;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..a9429f90f5418035152b678108dd7a97
</span> m_filterPanel = NULL;
m_filterChoice = NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,14 +154,17 @@ void FileDialog::Create(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,14 +156,17 @@ void FileDialog::Create(
</span> long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
{
FileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..a9429f90f5418035152b678108dd7a97
</span> }
bool FileDialog::SupportsExtraControl() const
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,12 +314,26 @@ void FileDialog::ShowWindowModal()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,12 +316,26 @@ void FileDialog::ShowWindowModal()
</span> [sPanel setAllowsOtherFileTypes:NO];
NSWindow* nativeParent = parentWindow->GetWXWindow();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..a9429f90f5418035152b678108dd7a97
</span> {
NSOpenPanel* oPanel = [NSOpenPanel openPanel];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,11 +347,22 @@ void FileDialog::ShowWindowModal()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -330,11 +349,22 @@ void FileDialog::ShowWindowModal()
</span> [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
NSWindow* nativeParent = parentWindow->GetWXWindow();
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/src-Makefile-for-osx.diff b/audio/audacity/files/src-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c22ef0a..50c8ce9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/src-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/src-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/src/Makefile.am b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2dea345..eb77b29 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e61be0e4e..c45cb3080 100644
</span> --- a/src/Makefile.am
+++ b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,8 +78,9 @@ audacity_CPPFLAGS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,8 +79,9 @@ audacity_CPPFLAGS = \
</span> # /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
# ^
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +15,10 @@ index 2dea345..eb77b29 100644
</span> audacity_LDFLAGS = -rdynamic
audacity_LDADD = \
diff --git a/src/Makefile.in b/src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 55cf7ec..d6526bb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d28e7abc1..63b795932 100644
</span> --- a/src/Makefile.in
+++ b/src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1161,8 +1161,9 @@ audacity_CPPFLAGS = -std=c++11 -Wno-deprecated-declarations \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1287,8 +1287,9 @@ audacity_CPPFLAGS = -std=c++11 -Wno-deprecated-declarations \
</span> # /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
# ^
</pre><pre style='margin:0'>
</pre>