Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171015033393180"
MIME-Version: 1.0
Date: Mon, 11 Mar 2024 09:45:33 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/math/qalculate
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20240311094533.122ADFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171015033393180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Mon Mar 11 09:45:32 UTC 2024

Modified Files:
	pkgsrc/math/qalculate: distinfo
Added Files:
	pkgsrc/math/qalculate/patches: patch-libqalculate_QalculateDateTime.cc

Log Message:
qalculate: Avoid sun define.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/qalculate/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/qalculate/patches/patch-libqalculate_QalculateDateTime.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171015033393180
Content-Disposition: inline
Content-Length: 1967
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/math/qalculate/distinfo
diff -u pkgsrc/math/qalculate/distinfo:1.30 pkgsrc/math/qalculate/distinfo:1.31
--- pkgsrc/math/qalculate/distinfo:1.30	Tue Feb  6 02:54:34 2024
+++ pkgsrc/math/qalculate/distinfo	Mon Mar 11 09:45:32 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.30 2024/02/06 02:54:34 markd Exp $
+$NetBSD: distinfo,v 1.31 2024/03/11 09:45:32 jperkin Exp $
 
 BLAKE2s (libqalculate-4.9.0.tar.gz) = b7bc658c8ef3d6aac0dbc1c64cabff67cf61a9a5ea50c96a6cbe0623d5b79cce
 SHA512 (libqalculate-4.9.0.tar.gz) = d23e3c9080bb5329e36fc1fda258a99eb83774e15ddb6d717a9268d812901292a99f6d508006492d923cffed1ab01d5c66e23499b661570baad9abcf217efce2
 Size (libqalculate-4.9.0.tar.gz) = 2639589 bytes
+SHA1 (patch-libqalculate_QalculateDateTime.cc) = 6675f39ecea4d88abab72391bca4cc9331879f85

Added files:

Index: pkgsrc/math/qalculate/patches/patch-libqalculate_QalculateDateTime.cc
diff -u /dev/null pkgsrc/math/qalculate/patches/patch-libqalculate_QalculateDateTime.cc:1.1
--- /dev/null	Mon Mar 11 09:45:33 2024
+++ pkgsrc/math/qalculate/patches/patch-libqalculate_QalculateDateTime.cc	Mon Mar 11 09:45:32 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-libqalculate_QalculateDateTime.cc,v 1.1 2024/03/11 09:45:32 jperkin Exp $
+
+Avoid sun define.
+
+--- libqalculate/QalculateDateTime.cc.orig	2024-03-11 09:42:35.031529108 +0000
++++ libqalculate/QalculateDateTime.cc
+@@ -2026,8 +2026,8 @@ Number chinese_new_moon_before(Number da
+ 	return ret;
+ }
+ Number chinese_solar_longitude_on_or_after(Number lam, Number tee) {
+-	Number sun = solar_longitude_after(lam, universal_from_standard(tee, chinese_zone(tee)));
+-	return standard_from_universal(sun, chinese_zone(sun));
++	Number s = solar_longitude_after(lam, universal_from_standard(tee, chinese_zone(tee)));
++	return standard_from_universal(s, chinese_zone(s));
+ }
+ Number current_major_solar_term(Number date) {
+ 	Number s = solar_longitude(universal_from_standard(date, chinese_zone(date)));


--_----------=_171015033393180--