pkg/33768: audio/audacity fails to build (includes patch)

[martijnb%atlas.ipv6.stack.nl@localhost]

>Number:         33768
>Category:       pkg
>Synopsis:       audio/audacity fails to build (includes patch)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 19 19:30:01 +0000 2006
>Originator:     martijnb%atlas.ipv6.stack.nl@localhost
>Release:        NetBSD 3.99.21
>Organization:
        
>Environment:
        
        
System: NetBSD atlas.ipv6.stack.nl 3.99.21 NetBSD 3.99.21 (ATLAS) #0: Tue Jun 
13 23:23:19 CEST 2006 
martijnb%atlas.ipv6.stack.nl@localhost:/usr/obj/sys/arch/amd64/compile/ATLAS 
amd64
Architecture: x86_64
Machine: amd64
>Description:
        Ever since the import of wxGTK 2.6, Audacity has been failing to
build:

c++ -c -O2 -I/usr/pkg/include -I/usr/include -DGLX_GLXEXT_LEGACY 
-I/usr/pkg/xorg/include -I/usr/pkg/include/freetype2 
-I../lib-src/portmixer/px_common -I../lib-src/soundtouch/include -O2 
-I/usr/pkg/include -I/usr/include -DGLX_GLXEXT_LEGACY -I/usr/pkg/xorg/include 
-I/usr/pkg/include/freetype2 -I../lib-src/expat -I../lib-src/allegro 
-I../lib-src/libnyquist/nyx -I../lib-src/libresample/include 
-DPNG_NO_ASSEMBLER_CODE -I/usr/pkg/include -I/usr/include -DGLX_GLXEXT_LEGACY 
-I/usr/pkg/xorg/include -I/usr/pkg/include/freetype2 -Wall -Iinclude 
-DPNG_NO_ASSEMBLER_CODE -I/usr/pkg/include -I/usr/include -DGLX_GLXEXT_LEGACY 
-I/usr/pkg/xorg/include -I/usr/pkg/include/freetype2 
-I/usr/pkg/lib/wx/include/gtk2-ansi-release-2.6 -I/usr/pkg/include/wx-2.6 
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES     
effects/ToneGen.cpp -o obj/effects/ToneGen.o
effects/ToneGen.cpp: In function `wxSizer* CreateToneGenDialog(wxWindow*, bool, 
   bool)':
effects/ToneGen.cpp:268: error: ISO C++ says that `
   wxChoice::wxChoice(wxWindow*, int, const wxPoint&, const wxSize&, int, const 
   wxString*, long int, const wxValidator&, const wxString&)' and `
   wxChoice::wxChoice(wxWindow*, int, const wxPoint&, const wxSize&, const 
   wxArrayString&, long int, const wxValidator&, const wxString&)' are 
   ambiguous even though the worst conversion for the former is better than the 
   worst conversion for the latter
gmake[1]: *** [obj/effects/ToneGen.o] Error 1
gmake[1]: Leaving directory 
`/pkg_comp/obj/pkgsrc/audio/audacity/default/audacity-src-1.2.4b/src'
gmake: *** [audacity] Error 2

>How-To-Repeat:
        Try to build audio/audacity
>Fix:
        Based on the FreeBSD port:

$NetBSD$

--- src/effects/ToneGen.cpp.orig        2005-11-27 03:33:32.000000000 +0100
+++ src/effects/ToneGen.cpp
@@ -265,7 +265,7 @@ wxSizer *CreateToneGenDialog(wxWindow * 
    item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
 
    wxChoice *item4 = new wxChoice(parent, ID_WAVEFORM, wxDefaultPosition,
-                                  wxSize(80, -1), 0, NULL);
+                                  wxSize(80, -1), 0, NULL,0);
    item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
 
    item0->Add(item2, 1, wxALIGN_CENTRE | wxALL, 5);

>Unformatted: