rpms/kphone/devel kphone-gcc41.patch, NONE, 1.1 kphone.spec, 1.20, 1.21

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4718

Modified Files:
	kphone.spec 
Added Files:
	kphone-gcc41.patch 
Log Message:
Patch for gcc 4.1


kphone-gcc41.patch:

--- NEW FILE kphone-gcc41.patch ---
diff -Nur kphone-orig/kphone/kcallwidget.h kphone/kphone/kcallwidget.h
--- kphone-orig/kphone/kcallwidget.h	2005-04-18 08:04:40.000000000 -0500
+++ kphone/kphone/kcallwidget.h	2006-02-03 06:58:25.000000000 -0600
@@ -67,7 +67,7 @@
 	void clickHangup( void );
 	void setHide( void );
 	bool isHided( void ) const { return hided; }
-	void KCallWidget::setDTMFSender( QString &s );
+	void setDTMFSender( QString &s );
 
 public slots:
 	void pleaseDial( const SipUri &dialuri );
diff -Nur kphone-orig/kphone/kphoneview.h kphone/kphone/kphoneview.h
--- kphone-orig/kphone/kphoneview.h	2005-04-18 08:04:40.000000000 -0500
+++ kphone/kphone/kphoneview.h	2006-02-03 06:58:58.000000000 -0600
@@ -54,7 +54,7 @@
 	QString getStunSrv( void );
 	void kphoneQuit( void );
 	bool getState( void );
-	KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype );
+	KCallWidget *DoCall( QString num, SipCall::CallType ctype );
 
 signals:
 	void stateChanged( void );


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kphone.spec	22 Dec 2005 05:14:24 -0000	1.20
+++ kphone.spec	3 Feb 2006 23:33:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -12,6 +12,7 @@
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
 Patch3:         kphone-4.2-callaudio-stun-init.patch
+Patch4:		kphone-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -26,6 +27,7 @@
 %setup -q -n kphone
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch4 -p1 -b .gcc41
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,6 +60,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Feb 02 2006 Dennis Gilmore <dennis at ausil.us> 4.2-5
+- patch for gcc 4.1
+
 * Wed Dec 21 2005 Dennis Gilmore <dennis at ausil.us> 4.2-4
 -rebuild for new gcc :)