head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.2 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.2.0.50 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.48 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.46 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.44 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.42 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.40 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.38 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.36 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.34 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.32 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.30 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.28 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.26 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.24 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.22 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.20 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.18 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.16 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.14 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.12 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.10 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.8 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.6 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.4 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.1.0.40 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.38 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.36 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.34 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.32 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.30 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.28 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.26 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.24 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.20 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.18 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.16 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.14 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.12 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.10 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.8 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.6 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.4 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.2 pkgsrc-2015Q1-base:1.1; locks; strict; comment @// @; 1.3 date 2025.12.21.14.38.39; author markd; state Exp; branches; next 1.2; commitid DA1XJ8gniUTqKhnG; 1.2 date 2019.11.24.03.41.55; author markd; state Exp; branches; next 1.1; commitid B7JnuzWW9BMpr3MB; 1.1 date 2015.01.07.13.14.30; author jperkin; state Exp; branches; next ; commitid uhlZDRQ9LdRdT55y; desc @@ 1.3 log @marble: update to 25.08.3 Qt6/KF6 version - Two years of development. @ text @$NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.2 2019/11/24 03:41:55 markd Exp $ Avoid 'sun' definition. --- src/lib/astro/solarsystem.cpp.orig 2025-10-06 03:25:22.000000000 +0000 +++ src/lib/astro/solarsystem.cpp @@@@ -399,7 +399,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, r1, v1; @@@@ -410,7 +410,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); @@@@ -1535,7 +1535,7 @@@@ Vec3 SolarSystem::SnPos(double &ep2, dou // 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; @@@@ -1543,7 +1543,7 @@@@ Vec3 SolarSystem::SnPos(double &ep2, dou 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]; @ 1.2 log @marble: update to 19.08.3 qt5/kf5 version @ text @d1 1 a1 1 $NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.1 2015/01/07 13:14:30 jperkin Exp $ d5 1 a5 1 --- src/lib/astro/solarsystem.cpp.orig 2019-11-04 06:55:40.000000000 +0000 d7 1 a7 1 @@@@ -431,7 +431,7 @@@@ void SolarSystem::updateSolar() d9 19 a27 19 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, r1, v1; @@@@ -442,7 +442,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); @@@@ -1515,7 +1515,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 d29 8 a36 8 - Sun200 sun; + Sun200 msun; Mat3 mx; Vec3 rs, s; double t; @@@@ -1523,7 +1523,7 @@@@ Vec3 SolarSystem::SnPos (double &ep2, do t = ss_time + ss_del_tdut/86400.0; t = julcent (t); d38 4 a41 4 - rs = sun.position(t); + rs = msun.position(t); s = carpol(rs); els = s[1]; @ 1.1 log @Avoid conflict with 'sun' definition on SunOS. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- src/lib/astro/solarsystem.cpp.orig 2014-10-23 21:53:08.000000000 +0000 d7 1 a7 1 @@@@ -352,7 +352,7 @@@@ void SolarSystem::updateSolar() d15 2 a16 2 Vec3 coff; @@@@ -363,7 +363,7 @@@@ void SolarSystem::updateSolar() d25 1 a25 1 @@@@ -914,7 +914,7 @@@@ Vec3 SolarSystem::SnPos (double &ep2, do d34 1 a34 1 @@@@ -922,7 +922,7 @@@@ Vec3 SolarSystem::SnPos (double &ep2, do @