head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.2 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.1.0.88 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.86 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.84 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.82 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.80 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.78 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.76 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.74 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.72 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.70 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.68 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.66 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.64 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.62 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.60 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.58 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.56 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.54 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.52 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.50 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.48 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.46 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.42 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.22 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.44 pkgsrc-2019Q4-base:1.1 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.2 date 2025.12.21.14.38.39; author markd; state Exp; branches; next 1.1; commitid DA1XJ8gniUTqKhnG; 1.1 date 2015.01.07.13.14.30; author jperkin; state Exp; branches; next ; commitid uhlZDRQ9LdRdT55y; desc @@ 1.2 log @marble: update to 25.08.3 Qt6/KF6 version - Two years of development. @ text @$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 2025-10-06 03:25:22.000000000 +0000 +++ src/lib/astro/astrolib.cpp @@@@ -2183,7 +2183,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); @ 1.1 log @Avoid conflict with 'sun' definition on SunOS. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- src/lib/astro/astrolib.cpp.orig 2014-10-23 21:53:08.000000000 +0000 d7 2 a8 2 @@@@ -2137,7 +2137,7 @@@@ void Eclipse::equ_sun_moon(double jd, do Mat3 mx; d10 6 a15 6 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); @