Avoid "error: call of overloaded <func> is ambiguous". Fixes SunOS.

3 files changed, 35 insertions, 1 deletions

diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index e634ec3e11e..712edc181ae 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2013/03/26 23:30:46 joerg Exp $
+$NetBSD: distinfo,v 1.54 2014/07/11 20:06:20 jperkin Exp $
 
 SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720
 RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20
@@ -18,10 +18,12 @@ SHA1 (patch-bc) = 8e6349eb5680fa7ac807c09d38816e744aa359c2
 SHA1 (patch-bd) = 05c285a1965f5a9af03b0570ac51a1ea19d7fed0
 SHA1 (patch-be) = 69eee4103409cd10dc673c3f7da3736c9505e927
 SHA1 (patch-filesharing_advanced_kcm__sambaconf_qmultichecklistitem.cpp) = 46bb9a2788fc03651a0740b4c070246e18422bf4
+SHA1 (patch-kopete_kopete_chatwindow_emoticonselector.cpp) = 0f315d1d4125dd2622f56849386cfd389d75e7de
 SHA1 (patch-kopete_libkopete_kopetepasswordedaccount.h) = 65ba4a13c9933d2a8629daeadcf1e1516e8a80eb
 SHA1 (patch-kopete_libkopete_kopeteproperties.h) = 3428271a6840fdfb57d7aece2c6e68047c9db422
 SHA1 (patch-kopete_libkopete_ui_metacontactselectorwidget.h) = f3369979ef50bfcee1ea30be4fe687b991df8c8b
 SHA1 (patch-kopete_protocols_gadu_gadueditcontact.h) = 507b2d22d09cfb8f7055c8ced2e4a78d91bdc5f2
 SHA1 (patch-kopete_protocols_groupwise_libgroupwise_qcatlshandler.h) = 4c87cec82d736586c107a982c73dcd7a6c688017
+SHA1 (patch-kopete_protocols_msn_msnfiletransfersocket.cpp) = b81569f147321400757b97641b50456fafd14f99
 SHA1 (patch-krdc_vnc_rfbproto.c) = 0a48d5244638a592cd000231c4b97cd669300138
 SHA1 (patch-krfb_krfb_configuration_h) = ef3c84a02c03a9c24341cab9b691b68ef3c4f0cc
diff --git a/net/kdenetwork3/patches/patch-kopete_kopete_chatwindow_emoticonselector.cpp b/net/kdenetwork3/patches/patch-kopete_kopete_chatwindow_emoticonselector.cpp
new file mode 100644
index 00000000000..de8d14a282d
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-kopete_kopete_chatwindow_emoticonselector.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kopete_kopete_chatwindow_emoticonselector.cpp,v 1.1 2014/07/11 20:06:20 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kopete/kopete/chatwindow/emoticonselector.cpp.orig	2007-05-14 07:40:09.000000000 +0000
++++ kopete/kopete/chatwindow/emoticonselector.cpp
+@@ -70,7 +70,7 @@ void EmoticonSelector::prepareList(void)
+ 	int row = 0;
+ 	int col = 0;
+ 	QMap<QString, QStringList> list = Kopete::Emoticons::self()->emoticonAndPicList();
+-	int emoticonsPerRow = static_cast<int>(sqrt(list.count()));
++	int emoticonsPerRow = static_cast<int>(sqrt((float)list.count()));
+ 	//kdDebug(14000) << "emoticonsPerRow=" << emoticonsPerRow << endl;
+ 
+ 	if ( lay )
diff --git a/net/kdenetwork3/patches/patch-kopete_protocols_msn_msnfiletransfersocket.cpp b/net/kdenetwork3/patches/patch-kopete_protocols_msn_msnfiletransfersocket.cpp
new file mode 100644
index 00000000000..e0fcdc551f2
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-kopete_protocols_msn_msnfiletransfersocket.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-kopete_protocols_msn_msnfiletransfersocket.cpp,v 1.1 2014/07/11 20:06:20 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kopete/protocols/msn/msnfiletransfersocket.cpp.orig	2005-09-10 08:20:25.000000000 +0000
++++ kopete/protocols/msn/msnfiletransfersocket.cpp
+@@ -300,8 +300,8 @@ void MSNFileTransferSocket::slotSendFile
+ //		char i2= (char)floor( bytesRead / 256 ) ;
+ //		kdDebug(14140) << "MSNFileTransferSocket::slotSendFile: " << (int)i1 <<" + 256* "<< (int)i2 <<" = " << bytesRead <<endl;
+ 		block[0]='\0';
+-		block[1]= (char)fmod( bytesRead, 256 );
+-		block[2]= (char)floor( bytesRead / 256 );
++		block[1]= (char)fmod( (float)bytesRead, 256 );
++		block[2]= (char)floor( (float)bytesRead / 256 );
+ 
+ 		for (  int f = 0; f < bytesRead; f++ )
+ 		{