Sat Sep 11 08:53:19 2021 UTC ()
audacity: Backport a crash fix (and another crash workaround...)


(nia)
diff -r1.141 -r1.142 pkgsrc/audio/audacity/Makefile
diff -r1.44 -r1.45 pkgsrc/audio/audacity/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
diff -r0 -r1.1 pkgsrc/audio/audacity/patches/patch-src_audacity.desktop.in
diff -r0 -r1.1 pkgsrc/audio/audacity/patches/patch-src_menus_ViewMenus.cpp
cvs diff -r1.141 -r1.142 pkgsrc/audio/audacity/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/audacity/Makefile 2021/09/08 21:04:54 1.141
+++ pkgsrc/audio/audacity/Makefile 2021/09/11 08:53:19 1.142
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.141 2021/09/08 21:04:54 nia Exp $ 1# $NetBSD: Makefile,v 1.142 2021/09/11 08:53:19 nia Exp $
2 2
3# NOTES ON UPDATING 3# NOTES ON UPDATING
4# - Upstream is insisting that packages use their internal modified 4# - Upstream is insisting that packages use their internal modified
5# versions of libraries like wxWidgets. This goes against policy 5# versions of libraries like wxWidgets. This goes against policy
6# of not using vendored libraries. 6# of not using vendored libraries.
7# - Upstream is introducing telemetry. 7# - Upstream is introducing telemetry.
8# This should be disabled by default, Audacity is offline software. 8# This should be disabled by default, Audacity is offline software.
9# - Please test on NetBSD. 9# - Please test usage on NetBSD.
10DISTNAME= audacity-2.4.1 10DISTNAME= audacity-2.4.1
11PKGREVISION= 3 11PKGREVISION= 4
12CATEGORIES= audio 12CATEGORIES= audio
13MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/} 13MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
14GITHUB_PROJECT= Audacity 14GITHUB_PROJECT= Audacity
15GITHUB_TAG= Audacity-${PKGVERSION_NOREV} 15GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
16 16
17MAINTAINER= nia@NetBSD.org 17MAINTAINER= nia@NetBSD.org
18HOMEPAGE= https://www.audacityteam.org/ 18HOMEPAGE= https://www.audacityteam.org/
19COMMENT= Multi-track audio editor and recorder 19COMMENT= Multi-track audio editor and recorder
20LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license 20LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
21 21
22WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV} 22WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
cvs diff -r1.44 -r1.45 pkgsrc/audio/audacity/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/audacity/distinfo 2021/02/06 23:21:13 1.44
+++ pkgsrc/audio/audacity/distinfo 2021/09/11 08:53:19 1.45
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1$NetBSD: distinfo,v 1.44 2021/02/06 23:21:13 dbj Exp $ 1$NetBSD: distinfo,v 1.45 2021/09/11 08:53:19 nia Exp $
2 2
3SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829 3SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829
4RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2 4RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2
5SHA512 (audacity-2.4.1.tar.gz) = 2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25 5SHA512 (audacity-2.4.1.tar.gz) = 2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25
6Size (audacity-2.4.1.tar.gz) = 63935461 bytes 6Size (audacity-2.4.1.tar.gz) = 63935461 bytes
7SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86 7SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86
8SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994 8SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
9SHA1 (patch-configure) = 2cf208a6104c73c761156e2373d21af64606c31e 9SHA1 (patch-configure) = 2cf208a6104c73c761156e2373d21af64606c31e
10SHA1 (patch-configure.ac) = b34f733208080d57b30877d762e61a3d3fdec888 10SHA1 (patch-configure.ac) = b34f733208080d57b30877d762e61a3d3fdec888
11SHA1 (patch-include_audacity_Types.h) = 369ce152d4ecc8fd67fcb45fe4adf3260119571b 11SHA1 (patch-include_audacity_Types.h) = 369ce152d4ecc8fd67fcb45fe4adf3260119571b
12SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87 12SHA1 (patch-lib-src_FileDialog_Makefile.am) = cc78f4d26210b536b4e1d88ab668295625aac73b
13SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08 13SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
14SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e 14SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
15SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5 15SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5
16SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef 16SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
17SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee 17SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
18SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0 18SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
19SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d 19SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
20SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c 20SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
21SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a 21SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
 22SHA1 (patch-src_audacity.desktop.in) = 66e43b6cba4d0245210fb6e9b7345abef1828e89
22SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2 23SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 24SHA1 (patch-src_menus_ViewMenus.cpp) = df9a785ac572520f04cd16f5d6b023b8f253f24a
cvs diff -r1.3 -r1.4 pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am (expand / switch to unified diff)

--- pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am 2019/06/04 23:09:51 1.3
+++ pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am 2021/09/11 08:53:19 1.4
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.3 2019/06/04 23:09:51 nia Exp $ 1$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.4 2021/09/11 08:53:19 nia Exp $
2 2
3don't build a shared library of this. 3don't build a shared library of this.
4 4
5--- lib-src/FileDialog/Makefile.am.orig 2019-05-04 10:38:57.000000000 +0000 5--- lib-src/FileDialog/Makefile.am.orig 2020-05-19 09:43:53.000000000 +0000
6+++ lib-src/FileDialog/Makefile.am 6+++ lib-src/FileDialog/Makefile.am
7@@ -1,6 +1,6 @@ 7@@ -1,7 +1,7 @@
 8 AM_LIBTOOLFLAGS = --tag CC
8 ACLOCAL_AMFLAGS = -I m4 9 ACLOCAL_AMFLAGS = -I m4
9  10
10-lib_LTLIBRARIES = libFileDialog.la 11-lib_LTLIBRARIES = libFileDialog.la
11+noinst_LTLIBRARIES = libFileDialog.la 12+noinst_LTLIBRARIES = libFileDialog.la
12  13
13 libFileDialog_la_LIBTOOLFLAGS = --tag=CXX 14 libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
14 libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations 15 libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
File Added: pkgsrc/audio/audacity/patches/patch-src_audacity.desktop.in
$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@
File Added: pkgsrc/audio/audacity/patches/patch-src_menus_ViewMenus.cpp
$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"