Mon Jun 24 06:52:52 2013 UTC ()
Fixes for SunOS.
(jperkin)
diff -r1.5 -r1.6 pkgsrc/misc/marble/distinfo
diff -r0 -r1.1 pkgsrc/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
diff -r0 -r1.1 pkgsrc/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
--- pkgsrc/misc/marble/distinfo 2013/05/21 12:49:35 1.5
+++ pkgsrc/misc/marble/distinfo 2013/06/24 06:52:52 1.6
| @@ -1,5 +1,7 @@ | | | @@ -1,5 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2013/05/21 12:49:35 markd Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2013/06/24 06:52:52 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (marble-4.10.3.tar.xz) = 814fffa64d91bec647c3f7e5cb130a2027dd6815 | | 3 | SHA1 (marble-4.10.3.tar.xz) = 814fffa64d91bec647c3f7e5cb130a2027dd6815 |
| 4 | RMD160 (marble-4.10.3.tar.xz) = f8fe39d776d6d67b1f2b42bb17a8cf6868f08354 | | 4 | RMD160 (marble-4.10.3.tar.xz) = f8fe39d776d6d67b1f2b42bb17a8cf6868f08354 |
| 5 | Size (marble-4.10.3.tar.xz) = 19449908 bytes | | 5 | Size (marble-4.10.3.tar.xz) = 19449908 bytes |
| | | 6 | SHA1 (patch-src_plugins_render_satellites_mex_astrolib.h) = acc3477ca16f20f02c3fcdbb8285d9e9a3ec1706 |
| | | 7 | SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 0c12eb09d4bd7601236bde2e586000afd2fef18d |
$NetBSD: patch-src_plugins_render_satellites_mex_astrolib.h,v 1.1 2013/06/24 06:52:52 jperkin Exp $
Avoid 'sun' clash.
--- src/plugins/render/satellites/mex/astrolib.h.orig 2013-05-03 04:38:26.036168912 +0000
+++ src/plugins/render/satellites/mex/astrolib.h
@@ -13,6 +13,8 @@
#include "attlib.h"
+#undef sun
+
double ddd (int d, int m, double s); // deg, min, sec -> decimal degrees
void dms (double dd, int &d, int &m, double &s); // dec deg -> deg, min, sec
double mjd (int day, int month, int year, double hour); // modified Julian date
$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.1 2013/06/24 06:52:52 jperkin Exp $
Avoid 'sun' clash.
--- src/plugins/render/stars/StarsPlugin.cpp.orig 2013-05-03 04:38:26.039168883 +0000
+++ src/plugins/render/stars/StarsPlugin.cpp
@@ -23,6 +23,8 @@
#include "SunLocator.h"
#include "ViewportParams.h"
+#undef sun
+
namespace Marble
{