Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

gtk3.patch

@@ -0,0 +1,25 @@
+diff -up iaxclient-2.1beta3/configure.ac.gtk3 iaxclient-2.1beta3/configure.ac
+--- iaxclient-2.1beta3/configure.ac.gtk3	2019-10-28 22:42:59.089493180 -0400
++++ iaxclient-2.1beta3/configure.ac	2019-10-28 22:54:19.872681275 -0400
+@@ -180,8 +180,8 @@ PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >=
+ ]))
+ 
+ PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
+-PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)
++PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0], has_gtk2=yes, has_gtk2=no)
++PKG_CHECK_MODULES(GDK2, [gdk-3.0 >= 3.0.0], has_gdk2=yes, has_gdk2=no)
+ PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
+ PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
+ PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
+diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.gtk3 iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc
+--- iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.gtk3	2019-10-28 22:42:59.072493076 -0400
++++ iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc	2019-10-28 23:01:48.424464563 -0400
+@@ -230,7 +230,6 @@ MyFrame::MyFrame(wxWindow *parent)
+     attr.height = 0;
+     attr.wclass = GDK_INPUT_ONLY;
+     attr.visual = NULL;
+-    attr.colormap = NULL;
+     attr.event_mask = 0;
+     keyStateWindow = gdk_window_new(NULL, &attr, 0);
+ #endif

iaxclient-c99.patch

@@ -0,0 +1,28 @@
+Include <sys/time.h> for the gettimeofday function.  This prevents an
+implicit function declaration and build failures with future
+compilers.
+
+Submitted upstream: <https://sourceforge.net/p/iaxclient/patches/57/>
+
+diff -ur iaxclient-2.1beta3.orig/simpleclient/stresstest/file.c iaxclient-2.1beta3/simpleclient/stresstest/file.c
+--- iaxclient-2.1beta3.orig/simpleclient/stresstest/file.c	2008-04-07 18:05:27.000000000 +0200
++++ iaxclient-2.1beta3/simpleclient/stresstest/file.c	2023-02-24 15:00:47.282858961 +0100
+@@ -1,6 +1,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <sys/time.h>
+ #include "file.h"
+ 
+ #ifdef __GNUC__
+diff -ur iaxclient-2.1beta3.orig/simpleclient/stresstest/stresstest.c iaxclient-2.1beta3/simpleclient/stresstest/stresstest.c
+--- iaxclient-2.1beta3.orig/simpleclient/stresstest/stresstest.c	2008-04-07 18:05:27.000000000 +0200
++++ iaxclient-2.1beta3/simpleclient/stresstest/stresstest.c	2023-02-24 15:00:33.952996082 +0100
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <signal.h>
++#include <sys/time.h>
+ 
+ #include "iaxclient.h"
+ #include "file.h"

iaxclient-gcc14.patch

@@ -0,0 +1,78 @@
+diff -rupN iaxclient-2.1beta3/simpleclient/stresstest/file.c iaxclient-2.1beta3-new/simpleclient/stresstest/file.c
+--- iaxclient-2.1beta3/simpleclient/stresstest/file.c	2008-04-07 18:05:27.000000000 +0200
++++ iaxclient-2.1beta3-new/simpleclient/stresstest/file.c	2024-01-30 08:30:07.301340562 +0100
+@@ -65,11 +65,12 @@ void append_node(struct ogg_stream *os,
+  *
+  * To whoever came up with this convoluted scheme: please consider a change of careers.
+  */
+-int read_theora_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
++int read_theora_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data)
+ {
+ 	struct op_node        *node;
+ 	struct theora_headers *th;
+ 	long                  timestamp = 0;
++	ogg_packet            *op = &(ozp->op);
+ 
+ 	//mylog("Got theora packet, serialno=%d, size=%d, packetno=%lld, granulepos=%lld\n",
+ 	//		serialno, op->bytes, op->packetno, op->granulepos);
+@@ -115,11 +116,12 @@ int read_theora_cb(OGGZ *oggz, ogg_packe
+ 	return 0;
+ }
+ 
+-int read_speex_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
++int read_speex_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data)
+ {
+ 	struct op_node *node;
+ 	long            timestamp;
+ 	static int      cnt = 0;
++	ogg_packet      *op = &(ozp->op);
+ 
+ 	timestamp = audio_stream->page_ts + audio_stream->page_count * SPEEX_FRAME_DURATION;
+ 	audio_stream->page_count++;
+@@ -138,12 +140,13 @@ int read_speex_cb(OGGZ *oggz, ogg_packet
+ 	return 0;
+ }
+ 
+-int read_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
++int read_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data)
+ {
+ 	struct theora_headers *th;
+ 
+ 	const char theoraId[] = "\x80theora";
+ 	const char speexId[] = "Speex   ";
++	ogg_packet            *op = &(ozp->op);
+ 
+ 	if ( memcmp(op->packet, theoraId, strlen(theoraId)) == 0 )
+ 	{
+@@ -157,13 +160,13 @@ int read_cb(OGGZ *oggz, ogg_packet *op,
+ 		theora_comment_init(&(th->tc));
+ 		video_stream->data = th;
+ 
+-		read_theora_cb(oggz, op, serialno, data);
++		read_theora_cb(oggz, ozp, serialno, data);
+ 	} else if ( memcmp(op->packet, speexId, strlen(speexId)) == 0 )
+ 	{
+ 		//mylog("Detected a Speex stream with serialno=%d\n", serialno);
+ 		oggz_set_read_callback(oggz, serialno, read_speex_cb, NULL);
+ 		audio_stream->serialno = serialno;
+-		read_speex_cb(oggz, op, serialno, data);
++		read_speex_cb(oggz, ozp, serialno, data);
+ 	} else
+ 	{
+ 		mylog("Got unknown ogg packet, serialno=%d, size=%d, packetno=%d, granulepos=%d\n",
+diff -rupN iaxclient-2.1beta3/simpleclient/stresstest/file.h iaxclient-2.1beta3-new/simpleclient/stresstest/file.h
+--- iaxclient-2.1beta3/simpleclient/stresstest/file.h	2008-04-07 18:05:27.000000000 +0200
++++ iaxclient-2.1beta3-new/simpleclient/stresstest/file.h	2024-01-30 08:26:43.708245923 +0100
+@@ -39,9 +39,9 @@ struct theora_headers
+ 	int            have_headers;
+ };
+ 
+-int read_theora_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
+-int read_speex_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
+-int read_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
++int read_theora_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data);
++int read_speex_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data);
++int read_cb(OGGZ *oggz, oggz_packet *ozp, long serialno, void *data);
+ int read_page_cb(OGGZ *oggz, const ogg_page *og, long serialno, void *data);
+ void load_ogg_file(const char *filename);
+ 

iaxclient.spec

@@ -1,16 +1,15 @@
 %global betaver beta3
 %global tclver 0.2
 %global mainver 2.1
-%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8.6)}
 %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %global tkphonearch %{_arch}
 
 Name:		iaxclient
 Version:	%{mainver}
-Release:	0.25.%{betaver}%{?dist}
+Release:	0.53.%{betaver}%{?dist}
 Summary:	Library for creating telephony solutions that interoperate with Asterisk
-Group:		System Environment/Libraries
-License:	LGPLv2+
+License:	LGPL-2.0-or-later
 URL:		http://iaxclient.wiki.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz
 Source1:	tkiaxphone.desktop
@@ -32,17 +31,36 @@ 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
+Patch13:        gtk3.patch
+Patch14:	iaxclient-gcc14.patch
+
 # Fix some makefile issues
 Patch20:	iax-0.2.3_makefile.patch
 # Fix format-security issue
 Patch21:	iax-0.2.3_format-security.patch
 # Add missing #include <sys/socket.h>
 Patch22:	iax-0.2.3_socket.patch
+Patch23:	iaxclient-c99.patch
 
-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:	spandsp-devel, ilbc-devel, speexdsp-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc-c++
+BuildRequires:  gsm-devel
+BuildRequires:  gtk3-devel
+BuildRequires:  ilbc-devel
+BuildRequires:  libogg-devel
+BuildRequires:  liboggz-devel
+BuildRequires:  libtheora-devel
+BuildRequires:  libtool
+BuildRequires:  libvidcap-devel
+BuildRequires:  make
+BuildRequires:  portaudio-devel
+BuildRequires:  SDL-devel
+BuildRequires:  spandsp-devel
+BuildRequires:  speex-devel
+BuildRequires:  speexdsp-devel
+BuildRequires:  tk-devel < 1:9
+BuildRequires:  wxGTK-devel
 
 %description
 Iaxclient is an open source, multiplatform library for creating telephony 
@@ -57,7 +75,6 @@ for telephony applications.
 
 %package libiax
 Summary:	IAX library
-Group:		System Environment/Libraries
 Obsoletes:	iax < 0.2.3
 
 %description libiax
@@ -66,7 +83,6 @@ version of the abandoned upstream IAX library.
 
 %package libiax-devel
 Summary:	IAX library development files
-Group:		Development/Libraries
 Requires:	%{name}-libiax%{?_isa} = %{version}-%{release}
 Obsoletes:	iax-devel < 0.2.3
 
@@ -77,7 +93,6 @@ developing applications that use %{name}-libiax.
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
 Requires:	pkgconfig
 Requires:	%{name} = %{mainver}-%{release}
 
@@ -88,8 +103,7 @@ developing applications that use %{name}.
 %package -n tcl-iaxclient
 Summary:	Tcl interface to iax2 client lib
 Version:	%{tclver}
-Group:		System Environment/Libraries
-License:	BSD
+License:	BSD-3-Clause-No-Nuclear-License
 Requires:	tcl(abi) = 8.6
 Requires:	%{name} = %{mainver}-%{release}
 
@@ -99,8 +113,7 @@ Tcl extensions to iaxclient libraries.
 %package -n tkiaxphone
 Summary:	Tk IAX Phone Client
 Version:	%{mainver}
-Group:		Applications/Internet
-License:	LGPLv2+
+License:	LGPL-2.0-or-later
 Requires:	tcl(abi) = 8.6
 Requires:	%{name} = %{mainver}-%{release}
 
@@ -110,8 +123,7 @@ Tk IAX Phone Client.
 %package -n wxiax
 Summary:	wx IAX Phone Client
 Version:	%{mainver}
-Group:		Applications/Internet
-License:	LGPLv2+
+License:	LGPL-2.0-or-later
 Requires:	%{name} = %{mainver}-%{release}
 
 %description -n wxiax
@@ -119,18 +131,21 @@ wx IAX Phone Client.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{betaver}
-%patch0 -p1 -b .wxGTK28
-%patch1 -p1 -b .tkphone
-%patch2 -p1 -b .includedir
-%patch3 -p1 -b .libdir
-%patch4 -p1 -b .nodoc
-%patch5 -p1 -b .theoradetect
-%patch6 -p1 -b .DSO
-%patch7 -p1 -b .arm
-%patch8 -p1 -b .portable
-%patch9 -p1 -b .linkiax
-%patch10 -p1 -b .ilbc
-%patch11 -p1 -b .fpic
+%patch -P0 -p1 -b .wxGTK28
+%patch -P1 -p1 -b .tkphone
+%patch -P2 -p1 -b .includedir
+%patch -P3 -p1 -b .libdir
+%patch -P4 -p1 -b .nodoc
+%patch -P5 -p1 -b .theoradetect
+%patch -P6 -p1 -b .DSO
+%patch -P7 -p1 -b .arm
+%patch -P8 -p1 -b .portable
+%patch -P9 -p1 -b .linkiax
+%patch -P10 -p1 -b .ilbc
+%patch -P11 -p1 -b .fpic
+%patch -P12 -p1 -b .wx3
+%patch -P13 -p1 -b .gtk3
+%patch -P14 -p1 -b .gcc14
 
 # Delete bundled libraries (except libiax2) just to be sure
 rm -rf lib/{gsm, portmixer, sox, spandsp}
@@ -141,9 +156,9 @@ chmod -x contrib/tcl/README.txt
 
 (
 cd lib/libiax2
-%patch20 -p1 -b .iaxmakefile
-%patch21 -p1 -b .iaxfmtsecurity
-%patch22 -p1 -b .iaxsocket
+%patch -P20 -p1 -b .iaxmakefile
+%patch -P21 -p1 -b .iaxfmtsecurity
+%patch -P22 -p1 -b .iaxsocket
 
 sed -i 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|g' iax-config.in
 sed -i 's|/usr/lib|%{_libdir}|g' iax-config.in
@@ -151,6 +166,8 @@ sed -i 's|/usr/lib|%{_libdir}|g' iax-config.in
 autoreconf -vif
 )
 
+%patch -P23 -p1 -b .c99
+
 %build
 (
 cd lib/libiax2
@@ -158,7 +175,7 @@ cd lib/libiax2
 make %{?_smp_mflags} UCFLAGS="%{optflags}"
 )
 
-%configure --disable-static
+%configure --disable-static --with-wish=%{_bindir}/wish8.6
 # sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 # sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool"
@@ -204,14 +221,6 @@ cd %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/
 ln -s iaxcli iaxcli-Linux-%{tkphonearch}
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post libiax -p /sbin/ldconfig
-
-%postun libiax -p /sbin/ldconfig
-
 %files
 %doc AUTHORS ChangeLog README
 %license COPYING.LIB
@@ -254,6 +263,90 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch}
 %{_datadir}/pixmaps/wxiax.png
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.53.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Sandro Mani <manisandro@gmail.com> - 2.1-0.52.beta3
+- BR: tk-devel < 1:9
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.51.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 2.1-0.50.beta3
+- convert license to SPDX
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.49.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.48.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.47.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.46.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Feb 24 2023 Florian Weimer <fweimer@redhat.com> - 2.1-0.45.beta3
+- Port to C99
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.44.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Aug 04 2022 Scott Talbert <swt@techie.net> - 2.1-0.43.beta3
+- Rebuild with wxWidgets 3.2
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.42.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 Sandro Mani <manisandro@gmail.com> - 2.1-0.41.beta3
+- Rebuild (ilbc)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.40.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.39.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.38.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.37.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.36.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Oct 25 2019 Scott Talbert <swt@techie.net> - 2.1-0.35.beta3
+- Rebuild with wxWidgets GTK3 build
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.34.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.33.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 23 2018 Scott Talbert <swt@techie.net> - 2.1-0.32.beta3
+- Rebuild with wxWidgets 3.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.31.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Feb 18 2018 Sandro Mani <manisandro@gmail.com> - 2.1-0.30.beta3
+- Add missing BR: gcc-c++, make
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.29.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.28.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.27.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.26.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-0.25.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

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 @@
+                 </object>
+                 <minsize>44,30</minsize>
+               </object>
+-              <growablecols>0,1,2,3</growablecols>
++              <growablecols>0,1</growablecols>
+             </object>
+             <flag>wxGROW</flag>
+           </object>
+@@ -904,7 +904,7 @@
+                 </object>
+                 <minsize>64,30</minsize>
+               </object>
+-              <growablecols>0,1,2,3</growablecols>
++              <growablecols>0,1,2</growablecols>
+               <object class="sizeritem">
+                 <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                 <border>1</border>
+@@ -1032,11 +1032,11 @@
+           <object class="sizeritem">
+             <object class="wxFlexGridSizer">
+               <cols>2</cols>
+-              <growablecols>0,1,2,3</growablecols>
++              <growablecols>0,1</growablecols>
+               <object class="sizeritem">
+                 <object class="wxFlexGridSizer">
+                   <cols>1</cols>
+-                  <growablecols>0,1,2,3</growablecols>
++                  <growablecols>0</growablecols>
+                   <object class="sizeritem">
+                     <object class="wxButton" name="0">
+                       <label> </label>
+@@ -1083,7 +1083,7 @@
+               <object class="sizeritem">
+                 <object class="wxFlexGridSizer">
+                   <cols>1</cols>
+-                  <growablecols>0,1,2,3</growablecols>
++                  <growablecols>0</growablecols>
+                   <object class="sizeritem">
+                     <object class="wxButton" name="5">
+                       <label></label>
+@@ -1138,4 +1138,4 @@
+       <growablerows>1</growablerows>
+     </object>
+   </object>
+-</resource>
+\ No newline at end of file
++</resource>
+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;