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

7 files changed, 108 insertions, 1 deletions

diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 9d9c6a6acbd..dc8c387c3e2 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2013/01/15 15:27:19 joerg Exp $
+$NetBSD: distinfo,v 1.44 2014/07/14 09:35:47 jperkin Exp $
 
 SHA1 (kdeedu-3.5.10.tar.bz2) = c43f7bcd9cb7af7c77a78bc0bd7f51c0e572f589
 RMD160 (kdeedu-3.5.10.tar.bz2) = 312d0384fbf243d580b0d3d90e3e21b46a117d0d
@@ -10,10 +10,16 @@ SHA1 (patch-ad) = f936f907fb1c283a5470498c4c78027804b8d13f
 SHA1 (patch-ae) = 643cc5c94c96d8cc5d0b601e8210998ff7fb3ab1
 SHA1 (patch-af) = 75798ce6bc4edf3563fbdebc21b9a04127732e4b
 SHA1 (patch-kalzium_src_spectrumviewimpl.cpp) = f2ee83534c7ee477e92227d2f3eee9f582ce7722
+SHA1 (patch-kalzium_src_spectrumwidget.cpp) = b168a5adcb2eb4677e4d45f319bfe61ff4d37250
 SHA1 (patch-kbruch_src_fractionbasewidget.cpp) = caf54b0d8bd03b6494e55bee3d4c9c49262f08c7
+SHA1 (patch-kbruch_src_mainqtwidget.cpp) = d312d5ffb9a32ab35cdb01d60f80889e647b265d
 SHA1 (patch-kbruch_src_ratiowidget.cpp) = a2c4fca8e12cd4c5e5a08267e2966091e0f4b814
 SHA1 (patch-kbruch_src_resultwidget.cpp) = b005f0bb7a8ffd58cabf2ea153ec28dd4cbf9643
+SHA1 (patch-kbruch_src_taskview.cpp) = 3bd61c8ba28ce35e1b4c174459efbe545b2531ae
 SHA1 (patch-kbruch_src_taskwidget.cpp) = e31c5cfd937c4df4b7a519ee5edff28fb318587f
 SHA1 (patch-kiten_dict.h) = 7b6b27dd9935ef3262eb1defc9d84c0884ae6b94
 SHA1 (patch-kiten_xjdxgen.c) = 6c01e2a7d53833e1f38ea85b6626b8460f729a6e
+SHA1 (patch-kmplot_kmplot_View.cpp) = 979a7d76afbd7a0839b3ac28f203a008201a0579
+SHA1 (patch-kstars_kstars_fitshistogram.cpp) = 922c674cae2c81e3034eb0d935101860457b50f8
+SHA1 (patch-kstars_kstars_fitsviewer.cpp) = 57b4f4238c78287a788da20661de69f6e123687a
 SHA1 (patch-kstars_kstars_skyobject.cpp) = e0fbe76e6d485c651b5dddb8ef09bc8069d306b4
diff --git a/misc/kdeedu3/patches/patch-kalzium_src_spectrumwidget.cpp b/misc/kdeedu3/patches/patch-kalzium_src_spectrumwidget.cpp
new file mode 100644
index 00000000000..09e4bce653a
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kalzium_src_spectrumwidget.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kalzium_src_spectrumwidget.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kalzium/src/spectrumwidget.cpp.orig	2007-05-14 07:38:52.000000000 +0000
++++ kalzium/src/spectrumwidget.cpp
+@@ -235,7 +235,7 @@ void SpectrumWidget::drawTickmarks( QPai
+ 	const int d = 10;
+ 
+ 	//the total number of tickmarks to draw (small and long)
+-	const int numberOfTickmarks = ( int )floor( width()/d );
++	const int numberOfTickmarks = ( int )floor( (float)width()/d );
+ 
+ 	double pos = 0.0;
+ 		
diff --git a/misc/kdeedu3/patches/patch-kbruch_src_mainqtwidget.cpp b/misc/kdeedu3/patches/patch-kbruch_src_mainqtwidget.cpp
new file mode 100644
index 00000000000..eb11a1a0fab
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kbruch_src_mainqtwidget.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kbruch_src_mainqtwidget.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kbruch/src/mainqtwidget.cpp.orig	2005-09-10 08:18:00.000000000 +0000
++++ kbruch/src/mainqtwidget.cpp
+@@ -131,7 +131,7 @@ void MainQtWidget::readOptions()
+ 	m_maxMainDenominator = SettingsClass::max_main_denominator();
+ 
+ 	/* make sure that we can load config files with corrupted values */
+-	if (m_mulDiv == true && pow(2, m_nrRatios) > m_maxMainDenominator)
++	if (m_mulDiv == true && pow((float)2, (float)m_nrRatios) > m_maxMainDenominator)
+ 	{
+ 		m_nrRatios = 2;
+ 		m_maxMainDenominator = 10;
diff --git a/misc/kdeedu3/patches/patch-kbruch_src_taskview.cpp b/misc/kdeedu3/patches/patch-kbruch_src_taskview.cpp
new file mode 100644
index 00000000000..9e96384ac4a
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kbruch_src_taskview.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-kbruch_src_taskview.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kbruch/src/taskview.cpp.orig	2006-03-17 10:10:18.000000000 +0000
++++ kbruch/src/taskview.cpp
+@@ -196,8 +196,8 @@ void TaskView::setTaskParameters(bool pa
+ 		pnr_ratios = 5;
+ 
+ 	// the main denominator must be at least 2^pnr_ratios
+-	if (pow(2, pnr_ratios) > pmax_md)
+-		pmax_md = (unsigned int) pow(2, pnr_ratios);
++	if (pow((float)2, (float)pnr_ratios) > pmax_md)
++		pmax_md = (unsigned int) pow((float)2, (float)pnr_ratios);
+ 
+ 	// so everything seems to be fine, lets set the internal values to the given
+ 	// ones
diff --git a/misc/kdeedu3/patches/patch-kmplot_kmplot_View.cpp b/misc/kdeedu3/patches/patch-kmplot_kmplot_View.cpp
new file mode 100644
index 00000000000..646588f37c1
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kmplot_kmplot_View.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kmplot_kmplot_View.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kmplot/kmplot/View.cpp.orig	2006-05-22 18:03:40.000000000 +0000
++++ kmplot/kmplot/View.cpp
+@@ -890,7 +890,7 @@ void View::mousePressEvent(QMouseEvent *
+ 				if ( function_type=='x' &&  fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot
+ 				{
+ 					QValueVector<Ufkt>::iterator ufkt_y = it+1;
+-					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g)  && ufkt_y->fstr.contains('t')==1)
++					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)) < g && ufkt_y->fstr.contains('t')==1)
+ 					{
+ 						if ( csmode == -1)
+ 						{
diff --git a/misc/kdeedu3/patches/patch-kstars_kstars_fitshistogram.cpp b/misc/kdeedu3/patches/patch-kstars_kstars_fitshistogram.cpp
new file mode 100644
index 00000000000..4049e512a9a
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kstars_kstars_fitshistogram.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-kstars_kstars_fitshistogram.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kstars/kstars/fitshistogram.cpp.orig	2006-05-22 18:03:42.000000000 +0000
++++ kstars/kstars/fitshistogram.cpp
+@@ -289,7 +289,7 @@ void FITSHistogramCommand::execute()
+      
+     case FITSImage::FITSLog:
+     //coeff = 255. / log(1 + max);
+-    coeff = max / log(1 + max);
++    coeff = max / log(1.0 + max);
+     
+     for (int i=0; i < height; i++)
+       for (int j=0; j < width; j++)
+@@ -308,7 +308,7 @@ void FITSHistogramCommand::execute()
+       
+     case FITSImage::FITSSqrt:
+     //coeff = 255. / sqrt(max);
+-    coeff = max / sqrt(max);
++    coeff = max / sqrt((float)max);
+     
+     for (int i=0; i < height; i++)
+       for (int j=0; j < width; j++)
diff --git a/misc/kdeedu3/patches/patch-kstars_kstars_fitsviewer.cpp b/misc/kdeedu3/patches/patch-kstars_kstars_fitsviewer.cpp
new file mode 100644
index 00000000000..b07fb2b46da
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kstars_kstars_fitsviewer.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kstars_kstars_fitsviewer.cpp,v 1.1 2014/07/14 09:35:47 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- kstars/kstars/fitsviewer.cpp.orig	2005-09-10 08:17:55.000000000 +0000
++++ kstars/kstars/fitsviewer.cpp
+@@ -336,7 +336,7 @@ float * FITSViewer::loadData(const char
+     {
+     FITS_GETBITPIX32(tempData, pixval_32);
+     //pixval_32 = ntohl(pixval_32);
+-    if (isnan(pixval_32)) pixval_32 = 0;
++    if (isnan((double)pixval_32)) pixval_32 = 0;
+     buffer[i] = pixval_32;
+     tempData+=4;
+    }