diff --git a/iaxclient.spec b/iaxclient.spec index 8c90750..34c7d99 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -7,7 +7,7 @@ Name: iaxclient Version: %{mainver} -Release: 0.31.%{betaver}%{?dist} +Release: 0.32.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk Group: System Environment/Libraries License: LGPLv2+ @@ -32,6 +32,7 @@ Patch9: iaxclient-link-local-iax.patch Patch10: iaxclient-system-ilbc.patch # Add missing -fPIC to configure.ac test Patch11: iaxclient-2.1beta3-fpic.patch +Patch12: wxwidgets-3.0.patch # Fix some makefile issues Patch20: iax-0.2.3_makefile.patch # Fix format-security issue @@ -43,7 +44,7 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: speex-devel, libtheora-devel, gsm-devel, portaudio-devel BuildRequires: tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel -BuildRequires: wxGTK-devel, libvidcap-devel, desktop-file-utils, libtool +BuildRequires: compat-wxGTK3-gtk2-devel, libvidcap-devel, desktop-file-utils, libtool BuildRequires: spandsp-devel, ilbc-devel, speexdsp-devel %description @@ -133,6 +134,7 @@ wx IAX Phone Client. %patch9 -p1 -b .linkiax %patch10 -p1 -b .ilbc %patch11 -p1 -b .fpic +%patch12 -p1 -b .wx3 # Delete bundled libraries (except libiax2) just to be sure rm -rf lib/{gsm, portmixer, sox, spandsp} @@ -256,6 +258,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Thu Aug 23 2018 Scott Talbert - 2.1-0.32.beta3 +- Rebuild with wxWidgets 3.0 + * Fri Jul 13 2018 Fedora Release Engineering - 2.1-0.31.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/wxwidgets-3.0.patch b/wxwidgets-3.0.patch new file mode 100644 index 0000000..6c946d5 --- /dev/null +++ b/wxwidgets-3.0.patch @@ -0,0 +1,204 @@ +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc +--- iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc.wx3 2008-04-07 12:05:34.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc 2018-08-28 20:17:29.496494108 -0400 +@@ -274,7 +274,7 @@ int CallList::HandleStateEvent(struct ia + if(!str.IsSameAs(ws)) { + // Add to phone book if not there already + str.Printf(_T("%s/Extension"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str()); +- config->Write(str, c.remote); ++ config->Write(str, wxString(c.remote)); + } else { + // Since they're in the phone book, look for ringtone + str.Printf(_T("%s/RingTone"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str()); +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc +--- iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc.wx3 2008-04-07 12:05:34.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc 2018-08-28 19:56:46.175797499 -0400 +@@ -141,12 +141,12 @@ void DevicesDialog::GetAudioDevices() + // validated). Invalid input to SetAudioDevices selects defaults + + devname = wxGetApp().SpkInputDevice; +- if(devname) { ++ if(!devname.IsEmpty()) { + SpkInputDevice->SetSelection(SpkInputDevice->FindString(devname)); + } + + devname = wxGetApp().SpkOutputDevice; +- if(devname) { ++ if(!devname.IsEmpty()) { + SpkOutputDevice->SetSelection(SpkOutputDevice->FindString(devname)); + } + +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc +--- iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc.wx3 2008-04-07 12:05:34.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc 2018-08-28 20:00:58.154154971 -0400 +@@ -373,7 +373,7 @@ void AddPhoneListDialog::OnBrowse(wxComm + wxString dirHome; + wxGetHomeDir(&dirHome); + +- wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxOPEN ); ++ wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxFD_OPEN ); + where.ShowModal(); + + RingTone->SetValue(where.GetPath()); +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am +--- iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am.wx3 2008-04-07 12:05:34.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am 2018-08-28 20:30:57.926972522 -0400 +@@ -30,7 +30,7 @@ rc/logo.xpm $(XRCS) + + CLEANFILES = $(BUILT_SOURCES) + +-AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" ++AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" -DNDEBUG + AM_CXXFLAGS = $(GDK2_CFLAGS) $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) + + LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS) \ +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc +--- iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc.wx3 2008-04-07 12:05:34.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc 2018-08-28 20:00:27.769991328 -0400 +@@ -318,7 +318,7 @@ void PrefsDialog::OnBrowse(wxCommandEven + wxString dirHome; + wxGetHomeDir(&dirHome); + +- wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxOPEN ); ++ wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxFD_OPEN ); + where.ShowModal(); + + if(event.GetId() == XRCID("BrowseRingBack")) +diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc +--- iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc.wx3 2008-04-07 12:05:32.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc 2018-08-28 22:13:26.791498044 -0400 +@@ -889,7 +889,7 @@ + + 44,30 + +- 0,1,2,3 ++ 0,1 + + wxGROW + +@@ -904,7 +904,7 @@ + + 64,30 + +- 0,1,2,3 ++ 0,1,2 + + wxALL|wxGROW|wxALIGN_CENTRE + 1 +@@ -1032,11 +1032,11 @@ + + + 2 +- 0,1,2,3 ++ 0,1 + + + 1 +- 0,1,2,3 ++ 0 + + + +@@ -1083,7 +1083,7 @@ + + + 1 +- 0,1,2,3 ++ 0 + + + +@@ -1138,4 +1138,4 @@ + 1 + + +- +\ No newline at end of file ++ +diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc +--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.wx3 2018-08-22 23:48:33.066285080 -0400 ++++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc 2018-08-24 20:46:02.494650605 -0400 +@@ -424,7 +424,7 @@ void IAXFrame::CheckPTT() + + void IAXFrame::OnDTMF(wxCommandEvent &evt) + { +- iaxc_send_dtmf(*buttonlabels[evt.m_id]); ++ iaxc_send_dtmf(*buttonlabels[evt.GetId()]); + } + + void IAXFrame::OnDial(wxCommandEvent &evt) +@@ -643,7 +643,7 @@ void IAXFrame::DialBySpeedDialName(wxStr + } else { + Destination = name; + } +- iaxc_call((char *)Destination.c_str()); ++ iaxc_call((const char *)Destination.c_str()); + } + + BEGIN_EVENT_TABLE(IAXFrame, wxFrame) +@@ -763,7 +763,7 @@ bool IAXClient::OnInit() + } + + if(!optDestination.IsEmpty()) +- iaxc_call((char *)optDestination.c_str()); ++ iaxc_call((const char *)optDestination.c_str()); + + return true; + } +@@ -818,7 +818,7 @@ extern "C" { + AudioDialog::AudioDialog(wxWindow *parent, const wxString& title, + const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) : + wxDialog(parent, ID_AUDIO, title, +- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL) ++ pos, size, wxDEFAULT_DIALOG_STYLE) + { + wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL); + wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10); +@@ -968,7 +968,7 @@ END_EVENT_TABLE() + ServerDialog::ServerDialog(wxWindow *parent, const wxString& title, + const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) : + wxDialog(parent, ID_SERVER, title, +- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL) ++ pos, size, wxDEFAULT_DIALOG_STYLE) + { + wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL); + wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10); +@@ -1099,7 +1099,7 @@ END_EVENT_TABLE() + DialDialog::DialDialog(wxWindow *parent, const wxString& title, + const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) : + wxDialog(parent, ID_DIAL, title, +- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL) ++ pos, size, wxDEFAULT_DIALOG_STYLE) + { + + wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL); +diff -up iaxclient-2.1beta3/simpleclient/wx/wx.cc.wx3 iaxclient-2.1beta3/simpleclient/wx/wx.cc +--- iaxclient-2.1beta3/simpleclient/wx/wx.cc.wx3 2008-04-07 12:05:35.000000000 -0400 ++++ iaxclient-2.1beta3/simpleclient/wx/wx.cc 2018-08-28 19:49:23.491412552 -0400 +@@ -556,7 +556,7 @@ void IAXFrame::CheckPTT() + void IAXFrame::OnDTMF(wxCommandEvent &evt) + { + +- iaxc_send_dtmf(*buttonlabels[evt.m_id]); ++ iaxc_send_dtmf(*buttonlabels[evt.GetId()]); + } + + void IAXFrame::OnDial(wxCommandEvent& evt) +@@ -607,7 +607,7 @@ void IAXFrame::OnRegisterMenu(wxCommandE + wxTextEntryDialog dialog(this, + wxString("Register with a remote asterisk server",wxConvUTF8), + wxString("Format is user:password@hostname",wxConvUTF8), +- wxString(wxGetApp().optRegistration,wxConvUTF8), ++ wxGetApp().optRegistration, + wxOK | wxCANCEL); + + if(dialog.ShowModal() == wxID_OK) +@@ -813,7 +813,7 @@ bool IAXClient::OnInit() + } + + if(!optDestination.IsEmpty()) +- iaxc_call((char *)optDestination.c_str()); ++ iaxc_call((const char *)optDestination.c_str()); + + + return true;