diff options
-rw-r--r-- | audio/audacity/Makefile | 6 | ||||
-rw-r--r-- | audio/audacity/distinfo | 6 | ||||
-rw-r--r-- | audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am | 7 | ||||
-rw-r--r-- | audio/audacity/patches/patch-src_audacity.desktop.in | 16 | ||||
-rw-r--r-- | audio/audacity/patches/patch-src_menus_ViewMenus.cpp | 31 |
5 files changed, 58 insertions, 8 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 987c427e15c..e9ed610e474 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.141 2021/09/08 21:04:54 nia Exp $ +# $NetBSD: Makefile,v 1.142 2021/09/11 08:53:19 nia Exp $ # NOTES ON UPDATING # - Upstream is insisting that packages use their internal modified @@ -6,9 +6,9 @@ # of not using vendored libraries. # - Upstream is introducing telemetry. # This should be disabled by default, Audacity is offline software. -# - Please test on NetBSD. +# - Please test usage on NetBSD. DISTNAME= audacity-2.4.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/} GITHUB_PROJECT= Audacity diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index ece1d20a86d..a8cece477a7 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2021/02/06 23:21:13 dbj Exp $ +$NetBSD: distinfo,v 1.45 2021/09/11 08:53:19 nia Exp $ SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829 RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2 @@ -9,7 +9,7 @@ SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994 SHA1 (patch-configure) = 2cf208a6104c73c761156e2373d21af64606c31e SHA1 (patch-configure.ac) = b34f733208080d57b30877d762e61a3d3fdec888 SHA1 (patch-include_audacity_Types.h) = 369ce152d4ecc8fd67fcb45fe4adf3260119571b -SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87 +SHA1 (patch-lib-src_FileDialog_Makefile.am) = cc78f4d26210b536b4e1d88ab668295625aac73b SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5 @@ -19,4 +19,6 @@ SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda2 SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a +SHA1 (patch-src_audacity.desktop.in) = 66e43b6cba4d0245210fb6e9b7345abef1828e89 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2 +SHA1 (patch-src_menus_ViewMenus.cpp) = df9a785ac572520f04cd16f5d6b023b8f253f24a diff --git a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am index 1e83d9e1d29..46468aad2bc 100644 --- a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am +++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am @@ -1,10 +1,11 @@ -$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.3 2019/06/04 23:09:51 nia Exp $ +$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.4 2021/09/11 08:53:19 nia Exp $ don't build a shared library of this. ---- lib-src/FileDialog/Makefile.am.orig 2019-05-04 10:38:57.000000000 +0000 +--- lib-src/FileDialog/Makefile.am.orig 2020-05-19 09:43:53.000000000 +0000 +++ lib-src/FileDialog/Makefile.am -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + AM_LIBTOOLFLAGS = --tag CC ACLOCAL_AMFLAGS = -I m4 -lib_LTLIBRARIES = libFileDialog.la diff --git a/audio/audacity/patches/patch-src_audacity.desktop.in b/audio/audacity/patches/patch-src_audacity.desktop.in new file mode 100644 index 00000000000..b66df2e791c --- /dev/null +++ b/audio/audacity/patches/patch-src_audacity.desktop.in @@ -0,0 +1,16 @@ +$NetBSD: patch-src_audacity.desktop.in,v 1.1 2021/09/11 08:53:19 nia Exp $ + +I'm not sure I want to know why, but GDK_SYNCHRONIZE=1 stops the Reverse +option from crashing the program. + +--- src/audacity.desktop.in.orig 2020-05-19 09:43:53.000000000 +0000 ++++ src/audacity.desktop.in +@@ -46,7 +46,7 @@ Icon=@AUDACITY_NAME@ + Type=Application + Categories=AudioVideo;Audio;AudioVideoEditing; + +-Exec=env UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F ++Exec=env UBUNTU_MENUPROXY=0 GDK_SYNCHRONIZE=1 @AUDACITY_NAME@ %F + StartupNotify=false + Terminal=false + MimeType=application/x-audacity-project;@MIMETYPES@ diff --git a/audio/audacity/patches/patch-src_menus_ViewMenus.cpp b/audio/audacity/patches/patch-src_menus_ViewMenus.cpp new file mode 100644 index 00000000000..9d31d0c76cd --- /dev/null +++ b/audio/audacity/patches/patch-src_menus_ViewMenus.cpp @@ -0,0 +1,31 @@ +$NetBSD: patch-src_menus_ViewMenus.cpp,v 1.1 2021/09/11 08:53:19 nia Exp $ + +[PATCH] Fix crash on track resize + +As discussed in #538, there is an issue with the track resize option, +where with audacity >= 2.4.0, compiled using the autotools setup leads +to a hard crash. + +The sizeof(wxFrame) in src/menus/ViewMenus.cpp and src/ProjectWindow.cpp +is not aligned, leading to GetVerticalScrollBar in +src/menus/ViewMenus.cpp accessing unallocated memory. + +By ordering the include of ProjectWindow.h before the include of +Project.h, this crash is prevented. + +https://github.com/dvzrv/audacity/commit/d7e769040b508aaf15ce7b51cc1a565d41cdb079.patch + +--- src/menus/ViewMenus.cpp.orig 2020-05-19 09:43:53.000000000 +0000 ++++ src/menus/ViewMenus.cpp +@@ -4,10 +4,10 @@ + #include "../CommonCommandFlags.h" + #include "../Menus.h" + #include "../Prefs.h" ++#include "../ProjectWindow.h" + #include "../Project.h" + #include "../ProjectHistory.h" + #include "../ProjectSettings.h" +-#include "../ProjectWindow.h" + #include "../Track.h" + #include "../TrackInfo.h" + #include "../TrackPanel.h" |