Sun Jun 23 19:09:15 2013 UTC ()
SunOS build fixes.
(jperkin)
diff -r1.8 -r1.9 pkgsrc/misc/kstars/distinfo
diff -r0 -r1.1 pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp
diff -r0 -r1.1 pkgsrc/misc/kstars/patches/patch-kstars_skyobjects_satellite.cpp
diff -r0 -r1.1 pkgsrc/misc/kstars/patches/patch-kstars_tools_altvstime.cpp
diff -r0 -r1.1 pkgsrc/misc/kstars/patches/patch-kstars_widgets_moonphasecalendarwidget.h
--- pkgsrc/misc/kstars/distinfo 2013/05/21 12:49:35 1.8
+++ pkgsrc/misc/kstars/distinfo 2013/06/23 19:09:14 1.9
| @@ -1,6 +1,10 @@ | | | @@ -1,6 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.8 2013/05/21 12:49:35 markd Exp $ | | 1 | $NetBSD: distinfo,v 1.9 2013/06/23 19:09:14 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (kstars-4.10.3.tar.xz) = 32490b846b468dc9a8393c0a70cb0d0e805163a8 | | 3 | SHA1 (kstars-4.10.3.tar.xz) = 32490b846b468dc9a8393c0a70cb0d0e805163a8 |
| 4 | RMD160 (kstars-4.10.3.tar.xz) = bc37f90cb0590b87126b7b8a55ec922de00ee59e | | 4 | RMD160 (kstars-4.10.3.tar.xz) = bc37f90cb0590b87126b7b8a55ec922de00ee59e |
| 5 | Size (kstars-4.10.3.tar.xz) = 12490412 bytes | | 5 | Size (kstars-4.10.3.tar.xz) = 12490412 bytes |
| | | 6 | SHA1 (patch-kstars_fitsviewer_fitsimage.cpp) = f18ceecfa2267d0957f7f5d3b6e609a2d861b375 |
| 6 | SHA1 (patch-kstars_skyobjects_ksmoon.cpp) = 23d31289ca18075afb38324b72ca41a1287aa9b3 | | 7 | SHA1 (patch-kstars_skyobjects_ksmoon.cpp) = 23d31289ca18075afb38324b72ca41a1287aa9b3 |
| | | 8 | SHA1 (patch-kstars_skyobjects_satellite.cpp) = a30cd6139fff8e5968d704b901dd2a059548d527 |
| | | 9 | SHA1 (patch-kstars_tools_altvstime.cpp) = 24b8d4c31216fd08353e29825c6213349cfa6287 |
| | | 10 | SHA1 (patch-kstars_widgets_moonphasecalendarwidget.h) = c3c507447ea4586b2d1224e49cb4c44ba0a13918 |
$NetBSD: patch-kstars_fitsviewer_fitsimage.cpp,v 1.1 2013/06/23 19:09:15 jperkin Exp $
Avoid "ambiguous call to overloaded function" errors.
--- kstars/fitsviewer/fitsimage.cpp.orig 2013-05-03 04:38:11.831303171 +0000
+++ kstars/fitsviewer/fitsimage.cpp
@@ -474,7 +474,7 @@ bool FITSImage::checkCollision(Edge* s1,
int diff_x=s1->x - s2->x;
int diff_y=s1->y - s2->y;
- dis = abs( sqrt( diff_x*diff_x + diff_y*diff_y));
+ dis = abs( sqrt((float)diff_x*diff_x + diff_y*diff_y));
dis -= s1->width/2;
dis -= s2->width/2;
@@ -857,7 +857,7 @@ void FITSImage::applyFilter(FITSScale ty
break;
case FITS_LOG:
- coeff = max / log(1 + max);
+ coeff = max / log((float)1 + max);
for (int i=0; i < height; i++)
for (int j=0; j < width; j++)
@@ -873,7 +873,7 @@ void FITSImage::applyFilter(FITSScale ty
break;
case FITS_SQRT:
- coeff = max / sqrt(max);
+ coeff = max / sqrt((float)max);
for (int i=0; i < height; i++)
for (int j=0; j < width; j++)
$NetBSD: patch-kstars_skyobjects_satellite.cpp,v 1.1 2013/06/23 19:09:15 jperkin Exp $
Avoid "sun" conflict.
--- kstars/skyobjects/satellite.cpp.orig 2013-05-03 04:38:11.876302746 +0000
+++ kstars/skyobjects/satellite.cpp
@@ -58,6 +58,7 @@
#define F 3.35281066474748e-3 // Flattening factor
#define MFACTOR 7.292115e-5
+#undef sun
Satellite::Satellite( const QString name, const QString line1, const QString line2 )
{
$NetBSD: patch-kstars_tools_altvstime.cpp,v 1.1 2013/06/23 19:09:15 jperkin Exp $
Avoid "sun" conflict.
--- kstars/tools/altvstime.cpp.orig 2013-05-03 04:38:11.880302708 +0000
+++ kstars/tools/altvstime.cpp
@@ -45,6 +45,8 @@
#include "avtplotwidget.h"
#include "ui_altvstime.h"
+#undef sun
+
AltVsTimeUI::AltVsTimeUI( QWidget *p ) :
QFrame( p )
{
$NetBSD: patch-kstars_widgets_moonphasecalendarwidget.h,v 1.1 2013/06/23 19:09:15 jperkin Exp $
Avoid "sun" conflict.
--- kstars/widgets/moonphasecalendarwidget.h.orig 2013-05-03 04:38:11.897302548 +0000
+++ kstars/widgets/moonphasecalendarwidget.h
@@ -21,6 +21,8 @@
#include <QWidget>
#include <KDateTable>
+#undef sun
+
class KSMoon;
class KSSun;
class KStarsDateTime;