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

build on SunOS.

8 files changed, 134 insertions, 1 deletions

diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index 62786836401..27c73113b35 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.39 2012/05/04 16:15:33 joerg Exp $
+$NetBSD: distinfo,v 1.40 2013/09/12 20:11:30 jperkin Exp $
 
 SHA1 (kdegames-3.5.10.tar.bz2) = 287aa0d1ae19b8f04d64c4449fed6a7cec58844d
 RMD160 (kdegames-3.5.10.tar.bz2) = a185104b0048b0554f4638b482e69455eb10daa5
 Size (kdegames-3.5.10.tar.bz2) = 10783059 bytes
 SHA1 (patch-kfouleggs_Makefile.in) = 53fc5088a5f6221f17f766fd37095950643da7e3
+SHA1 (patch-kfouleggs_piece.cpp) = 38b19b6954ee554f723c0c4f5008499b7edb06e0
+SHA1 (patch-kjumpingcube_brain.cpp) = 7f0e31e5e91c74b19494de128c07151c344b7a6d
+SHA1 (patch-kjumpingcube_cubebox.cpp) = c8c652ff4c71954b5440eb76fe2d8c1088e0c9b5
 SHA1 (patch-klickety_Makefile.in) = eac00e6ac57e5e6c0a5fadb5cb2d03e72f263a4d
 SHA1 (patch-kmines_Makefile.in) = 279c24b558b48323a25ff1e4e50d2b942b96b1b2
+SHA1 (patch-kolf_floater.cpp) = eac067c86f2f51b339e0050455331ecff7c9a909
+SHA1 (patch-kolf_slope.cpp) = b074c39b3c913eadc3008f81d9d35239960cfd8b
+SHA1 (patch-kolf_vector.cpp) = 3d5c260249def2ee91629ad414bd0d0e1b3045de
+SHA1 (patch-konquest_gameboard.cc) = c645846f5dbb0c5859f07ebecf08e0cf2d803a82
 SHA1 (patch-kpat_dealer.cpp) = 29bf8e5681413a851a900485a620974be506e807
 SHA1 (patch-kpat_dealer.h) = 14f0c0fc03122db1a23a38f1c384b0e1258be3a6
 SHA1 (patch-ksirtet_ksirtet_Makefile.in) = cc9b7c9bba6039d5d5291e6e53c7afdf289b36b9
diff --git a/games/kdegames3/patches/patch-kfouleggs_piece.cpp b/games/kdegames3/patches/patch-kfouleggs_piece.cpp
new file mode 100644
index 00000000000..9ce087e61d6
--- /dev/null
+++ b/games/kdegames3/patches/patch-kfouleggs_piece.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-kfouleggs_piece.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kfouleggs/piece.cpp.orig	2005-09-10 08:18:28.000000000 +0000
++++ kfouleggs/piece.cpp
+@@ -49,13 +49,13 @@ void FEPieceInfo::setMask(QPixmap *pixma
+ 
+ 	// base circle
+     int w = pixmap->width();
+-	int d = (int)((sqrt(2)-2./3)*w);
++	int d = (int)((sqrt(2.)-2./3)*w);
+ 	QRect cr = QRect(0, 0, d, d);
+ 	cr.moveCenter(QPoint(w/2, w/2));
+ 	p.drawEllipse(cr);
+ 
+ 	if (blockMode) {
+-        int a  = (int)(w/(3.*sqrt(2)));
++        int a  = (int)(w/(3.*sqrt(2.)));
+         int ra = 2*w/3+1;
+         cr = QRect(0, 0, ra, ra);
+ 
diff --git a/games/kdegames3/patches/patch-kjumpingcube_brain.cpp b/games/kdegames3/patches/patch-kjumpingcube_brain.cpp
new file mode 100644
index 00000000000..8fbb9a4ebe4
--- /dev/null
+++ b/games/kdegames3/patches/patch-kjumpingcube_brain.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kjumpingcube_brain.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kjumpingcube/brain.cpp.orig	2005-10-10 14:56:06.000000000 +0000
++++ kjumpingcube/brain.cpp
+@@ -108,7 +108,7 @@ bool Brain::getHint(int& row, int& colum
+       worth[i]=new double[box.dim()];
+ 
+    // alle Werte auf kleinstmöglichen Wert setzen
+-   double min=-pow(2.0,sizeof(long int)*8-1);  // Maximum auf kleinst möglichen Wert setzen
++   double min=-pow(2.0,(float)sizeof(long int)*8-1);  // Maximum auf kleinst möglichen Wert setzen
+ 
+    for(i=0;i<box.dim();i++)
+      for(j=0;j<box.dim();j++)
diff --git a/games/kdegames3/patches/patch-kjumpingcube_cubebox.cpp b/games/kdegames3/patches/patch-kjumpingcube_cubebox.cpp
new file mode 100644
index 00000000000..7305df2cee7
--- /dev/null
+++ b/games/kdegames3/patches/patch-kjumpingcube_cubebox.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-kjumpingcube_cubebox.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kjumpingcube/cubebox.cpp.orig	2005-10-10 14:56:06.000000000 +0000
++++ kjumpingcube/cubebox.cpp
+@@ -194,10 +194,10 @@ double CubeBox::assessField(Player playe
+ 
+    if(player==One)
+    {
+-      return (int)pow((float)cubesOne,2)+pointsOne-(int)pow(cubesTwo,2)-pointsTwo;
++      return (int)pow((float)cubesOne,2)+pointsOne-(int)pow((float)cubesTwo,2)-pointsTwo;
+    }
+    else
+-      return (int)pow((float)cubesTwo,2)+pointsTwo-(int)pow(cubesOne,2)-pointsOne;
++      return (int)pow((float)cubesTwo,2)+pointsTwo-(int)pow((float)cubesOne,2)-pointsOne;
+ 
+ }
+ 
diff --git a/games/kdegames3/patches/patch-kolf_floater.cpp b/games/kdegames3/patches/patch-kolf_floater.cpp
new file mode 100644
index 00000000000..6706d4651b1
--- /dev/null
+++ b/games/kdegames3/patches/patch-kolf_floater.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kolf_floater.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kolf/floater.cpp.orig	2005-09-10 08:18:11.000000000 +0000
++++ kolf/floater.cpp
+@@ -31,7 +31,7 @@ void FloaterGuide::moveBy(double dx, dou
+ 
+ void FloaterGuide::setPoints(int xa, int ya, int xb, int yb)
+ {
+-	if (fabs(xa - xb) > 0 || fabs(ya - yb) > 0)
++	if (fabs((float)xa - xb) > 0 || fabs((float)ya - yb) > 0)
+ 	{
+ 		Wall::setPoints(xa, ya, xb, yb);
+ 		if (floater)
diff --git a/games/kdegames3/patches/patch-kolf_slope.cpp b/games/kdegames3/patches/patch-kolf_slope.cpp
new file mode 100644
index 00000000000..8ee20b38b15
--- /dev/null
+++ b/games/kdegames3/patches/patch-kolf_slope.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kolf_slope.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kolf/slope.cpp.orig	2005-09-10 08:18:11.000000000 +0000
++++ kolf/slope.cpp
+@@ -396,7 +396,7 @@ void Slope::updatePixmap()
+ 	p.drawTiledPixmap(QRect(0, 0, width(), height()), grass);
+ 	p.end();
+ 
+-	const double length = sqrt(width() * width() + height() * height()) / 4;
++	const double length = sqrt((float)width() * width() + height() * height()) / 4;
+ 
+ 	if (circle)
+ 	{
diff --git a/games/kdegames3/patches/patch-kolf_vector.cpp b/games/kdegames3/patches/patch-kolf_vector.cpp
new file mode 100644
index 00000000000..d319676aa79
--- /dev/null
+++ b/games/kdegames3/patches/patch-kolf_vector.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-kolf_vector.cpp,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kolf/vector.cpp.orig	2005-09-10 08:18:11.000000000 +0000
++++ kolf/vector.cpp
+@@ -6,14 +6,14 @@
+ 
+ // Creates a vector with between two points
+ Vector::Vector(const QPoint &source, const QPoint &dest) {
+-	_magnitude = sqrt(pow(source.x() - dest.x(), 2) + pow(source.y() - dest.y(), 2));
+-	_direction = atan2(source.y() - dest.y(), source.x() - dest.x());
++	_magnitude = sqrt(pow((float)source.x() - dest.x(), 2) + pow((float)source.y() - dest.y(), 2));
++	_direction = atan2((float)source.y() - dest.y(), source.x() - dest.x());
+ }
+ 
+ // Creates a vector with between two points
+ Vector::Vector(const Point &source, const Point &dest) {
+-	_magnitude = sqrt(pow(source.x - dest.x, 2) + pow(source.y - dest.y, 2));
+-	_direction = atan2(source.y - dest.y, source.x - dest.x);
++	_magnitude = sqrt(pow((float)source.x - dest.x, 2) + pow((float)source.y - dest.y, 2));
++	_direction = atan2((float)source.y - dest.y, source.x - dest.x);
+ }
+ 
+ // Creates an empty Vector
diff --git a/games/kdegames3/patches/patch-konquest_gameboard.cc b/games/kdegames3/patches/patch-konquest_gameboard.cc
new file mode 100644
index 00000000000..a5a3ddb53d5
--- /dev/null
+++ b/games/kdegames3/patches/patch-konquest_gameboard.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-konquest_gameboard.cc,v 1.1 2013/09/12 20:11:30 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- konquest/gameboard.cc.orig	2005-09-10 08:18:23.000000000 +0000
++++ konquest/gameboard.cc
+@@ -405,7 +405,7 @@ GameBoard::turn()
+ 						}
+                                                 if (skip) continue;
+ 
+-                                                shipsToSend = (int)floor((home->getFleet().getShipCount() - attack->getFleet().getShipCount()) / 2) ;
++                                                shipsToSend = (int)floor((float)(home->getFleet().getShipCount() - attack->getFleet().getShipCount()) / 2) ;
+                                                 
+ 					  	target = attack;
+ 					   	hasDestination = true;