Avoid conflict with 'sun' definition on SunOS.

4 files changed, 76 insertions, 1 deletions

diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index 9dad6a8ad24..93ae53224dc 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2014/11/13 19:19:06 markd Exp $
+$NetBSD: distinfo,v 1.10 2015/01/07 13:14:30 jperkin Exp $
 
 SHA1 (marble-4.14.3.tar.xz) = e2b039e61bdf828e30dd078c5bd5b55df0f5ef2b
 RMD160 (marble-4.14.3.tar.xz) = 13f10ab9fc4d0e963eb258854102172ade68bc91
 Size (marble-4.14.3.tar.xz) = 19709200 bytes
+SHA1 (patch-src_lib_astro_astrolib.cpp) = 541b39516af740b0ff8e485e9e4e8a339ca5d7f4
+SHA1 (patch-src_lib_astro_astrolib.h) = 4123af9f32a35400e05943598e7dceff84899928
+SHA1 (patch-src_lib_astro_solarsystem.cpp) = 4d4ccf0b1f76db81bc7e74561317f7981005fd51
 SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0
diff --git a/misc/marble/patches/patch-src_lib_astro_astrolib.cpp b/misc/marble/patches/patch-src_lib_astro_astrolib.cpp
new file mode 100644
index 00000000000..b50b0943c30
--- /dev/null
+++ b/misc/marble/patches/patch-src_lib_astro_astrolib.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_astro_astrolib.cpp,v 1.1 2015/01/07 13:14:30 jperkin Exp $
+
+Avoid 'sun' definition.
+
+--- src/lib/astro/astrolib.cpp.orig	2014-10-23 21:53:08.000000000 +0000
++++ src/lib/astro/astrolib.cpp
+@@ -2137,7 +2137,7 @@ void Eclipse::equ_sun_moon(double jd, do
+ 	Mat3 mx;
+ 
+ 	t = julcent (jd) + tdut / 3.15576e9;  // =(86400.0 * 36525.0);
+-	rs = sun.position(t);
++	rs = msun.position(t);
+ 	rm = moon.position(t);
+ 	rs = eclequ(t,rs);
+ 	rm = eclequ(t,rm);
diff --git a/misc/marble/patches/patch-src_lib_astro_astrolib.h b/misc/marble/patches/patch-src_lib_astro_astrolib.h
new file mode 100644
index 00000000000..6ecd8a17da0
--- /dev/null
+++ b/misc/marble/patches/patch-src_lib_astro_astrolib.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_astro_astrolib.h,v 1.1 2015/01/07 13:14:30 jperkin Exp $
+
+Avoid 'sun' definition.
+
+--- src/lib/astro/astrolib.h.orig	2014-10-23 21:53:08.000000000 +0000
++++ src/lib/astro/astrolib.h
+@@ -139,7 +139,7 @@ class ASTROLIB_EXPORT Eclipse      // Ec
+    int lunar (double jd, double tdut);
+ 
+   private: 
+-   Sun200 sun;
++   Sun200 msun;
+    Moon200 moon;
+    Vec3 rs, rm;   // position of the Sun and the Moon
+    Vec3 eshadow;  // unit vector in direction of shadow
diff --git a/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp b/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp
new file mode 100644
index 00000000000..1ece7489cd0
--- /dev/null
+++ b/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.1 2015/01/07 13:14:30 jperkin Exp $
+
+Avoid 'sun' definition.
+
+--- src/lib/astro/solarsystem.cpp.orig	2014-10-23 21:53:08.000000000 +0000
++++ src/lib/astro/solarsystem.cpp
+@@ -352,7 +352,7 @@ void SolarSystem::updateSolar()
+ 
+   const double ae = 23454.77992; // 149597870.0/6378.14 =  1AE -> Earth Radii
+   double dt, eps2;
+-  Sun200 sun;
++  Sun200 msun;
+   Moon200 moon;
+   Plan200 pln;
+   Vec3 coff;
+@@ -363,7 +363,7 @@ void SolarSystem::updateSolar()
+   // get positions in ecliptic coordinates of date
+   dt = ss_time + ss_del_tdut/86400.0;
+   dt = julcent (dt);
+-  ss_rs = sun.position(dt);
++  ss_rs = msun.position(dt);
+   ss_rm = moon.position(dt)/ae;
+   ss_pmer = pln.Mercury(dt);
+   ss_pven = pln.Venus(dt);
+@@ -914,7 +914,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
+   // return the apparent position of the Sun
+   // and the Nutation ep2 value and the ecliptic longitude of the Sun els
+ 
+-  Sun200 sun;
++  Sun200 msun;
+   Mat3 mx;
+   Vec3 rs, s;
+   double t;
+@@ -922,7 +922,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
+   t = ss_time + ss_del_tdut/86400.0;
+   t = julcent (t);
+ 
+-  rs = sun.position(t);
++  rs = msun.position(t);
+   s = carpol(rs);
+   els = s[1];
+