--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig	2021-02-04 18:52:51 UTC

+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c

@@ -19,8 +19,7 @@

 /* do some sanity checking: */

 #ifndef XL_BIG_ENDIAN

 #ifndef XL_LITTLE_ENDIAN

-#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined

-in xlisp.h

+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h

 #endif

 #endif

 #ifdef XL_BIG_ENDIAN

--- src/ProjectSerializer.cpp.orig	2021-02-04 18:52:51 UTC

+++ src/ProjectSerializer.cpp

@@ -206,9 +206,9 @@ ProjectSerializer::ProjectSerializer(size_t allocSize)

    std::call_once(flag, []{

       // Just once per run, store header information in the unique static

       // dictionary that will be written into each project that is saved.

-      // Store the size of "wxChar" so we can convert during recovery in

-      // case the file is used on a system with a different character size.

-      char size = sizeof(wxChar);

+      // Store the size of "wxStringCharType" so we can convert during recovery

+      // in case the file is used on a system with a different character size.

+      char size = sizeof(wxStringCharType);

       mDict.AppendByte(FT_CharSize);

       mDict.AppendData(&size, 1);

    });

@@ -242,7 +242,7 @@ void ProjectSerializer::WriteAttr(const wxString & nam

    mBuffer.AppendByte(FT_String);

    WriteName(name);

-   const Length len = value.length() * sizeof(wxChar);

+   const Length len = value.length() * sizeof(wxStringCharType);

    WriteLength( mBuffer, len );

    mBuffer.AppendData(value.wx_str(), len);

 }

@@ -309,7 +309,7 @@ void ProjectSerializer::WriteData(const wxString & val

 {

    mBuffer.AppendByte(FT_Data);

-   Length len = value.length() * sizeof(wxChar);

+   Length len = value.length() * sizeof(wxStringCharType);

    WriteLength( mBuffer, len );

    mBuffer.AppendData(value.wx_str(), len);

 }

@@ -317,7 +317,7 @@ void ProjectSerializer::WriteData(const wxString & val

 void ProjectSerializer::Write(const wxString & value)

 {

    mBuffer.AppendByte(FT_Raw);

-   Length len = value.length() * sizeof(wxChar);

+   Length len = value.length() * sizeof(wxStringCharType);

    WriteLength( mBuffer, len );

    mBuffer.AppendData(value.wx_str(), len);

 }

@@ -334,7 +334,7 @@ void ProjectSerializer::WriteSubTree(const ProjectSeri

 void ProjectSerializer::WriteName(const wxString & name)

 {

-   wxASSERT(name.length() * sizeof(wxChar) <= SHRT_MAX);

+   wxASSERT(name.length() * sizeof(wxStringCharType) <= SHRT_MAX);

    UShort id;

    auto nameiter = mNames.find(name);

@@ -346,7 +346,7 @@ void ProjectSerializer::WriteName(const wxString & nam

    {

       // mNames is static.  This appends each name to static mDict only once

       // in each run.

-      UShort len = name.length() * sizeof(wxChar);

+      UShort len = name.length() * sizeof(wxStringCharType);

       id = mNames.size();

       mNames[name] = id;

--- src/import/Import.cpp.orig	2021-02-04 18:52:51 UTC

+++ src/import/Import.cpp

@@ -803,9 +803,11 @@ bool Importer::Import( AudacityProject &project,

 /* i18n-hint: %s will be the filename */

 "Audacity did not recognize the type of the file '%s'.\n\n%sFor uncompressed files, also try File > Import > Raw Data.")

          .Format( fName,

+#if defined(USE_FFMPEG)

                   !FFmpegLibsInst()

-                  ? XO("Try installing FFmpeg.\n\n")

-                  : XO("") );

+                  ? XO("Try installing FFmpeg.\n\n") :

+#endif

+		Verbatim("") );

    }

    else

    {

--- src/widgets/FileConfig.cpp.orig	2021-02-04 18:52:51 UTC

+++ src/widgets/FileConfig.cpp

@@ -10,6 +10,8 @@

 #include "../Audacity.h"

+#include <errno.h>

+

 #include <wx/defs.h>

 #include <wx/app.h>

 #include <wx/bmpbuttn.h>