pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/finance/gnucash
Module Name: pkgsrc
Committed By: wiz
Date: Sun Dec 14 20:51:32 UTC 2025
Modified Files:
pkgsrc/finance/gnucash: Makefile distinfo
Added Files:
pkgsrc/finance/gnucash/patches:
patch-bindings_guile_test_srfi64-extras.scm
patch-bindings_guile_test_test-core-utils.scm
patch-bindings_guile_test_test-gnc-optiondb.scm
patch-gnucash_report_reports_standard_test_test-transaction.scm
patch-gnucash_report_test_test-commodity-utils.scm
patch-gnucash_report_test_test-html-chart.scm
patch-gnucash_report_test_test-report-utilities.scm
patch-gnucash_report_test_test-report.scm
Log Message:
gnucash: pull in upstream patches for guile 3.0.11 support
Requested by gdt@
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 pkgsrc/finance/gnucash/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/finance/gnucash/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_srfi64-extras.scm \
pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-core-utils.scm \
pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-gnc-optiondb.scm \
pkgsrc/finance/gnucash/patches/patch-gnucash_report_reports_standard_test_test-transaction.scm \
pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-commodity-utils.scm \
pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-html-chart.scm \
pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report-utilities.scm \
pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report.scm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/finance/gnucash/Makefile
diff -u pkgsrc/finance/gnucash/Makefile:1.376 pkgsrc/finance/gnucash/Makefile:1.377
--- pkgsrc/finance/gnucash/Makefile:1.376 Thu Oct 23 20:36:55 2025
+++ pkgsrc/finance/gnucash/Makefile Sun Dec 14 20:51:31 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.376 2025/10/23 20:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.377 2025/12/14 20:51:31 wiz Exp $
DISTNAME= gnucash-5.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_GITHUB:=gnucash/}
GITHUB_RELEASE= ${PKGVERSION_NOREV}
Index: pkgsrc/finance/gnucash/distinfo
diff -u pkgsrc/finance/gnucash/distinfo:1.132 pkgsrc/finance/gnucash/distinfo:1.133
--- pkgsrc/finance/gnucash/distinfo:1.132 Mon Sep 29 06:39:20 2025
+++ pkgsrc/finance/gnucash/distinfo Sun Dec 14 20:51:31 2025
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.132 2025/09/29 06:39:20 wiz Exp $
+$NetBSD: distinfo,v 1.133 2025/12/14 20:51:31 wiz Exp $
BLAKE2s (gnucash-5.13.tar.bz2) = 690c934c79307a3ab512463ee85c0bdbd023253f660c087ee1017e17f1dec666
SHA512 (gnucash-5.13.tar.bz2) = a6ee775a0b9f612f5db1bb22ef8571560d60e62e0c6e12aaaeef87129a17fc5f1e95bbdb9cb79bc2c68f9677b925e8e0d419291356f324d600e15d4493ac0d25
Size (gnucash-5.13.tar.bz2) = 15343812 bytes
SHA1 (patch-CMakeLists.txt) = 5f6a7786ad0a8a2aa0fcd01d652b2d2c35d39c80
+SHA1 (patch-bindings_guile_test_srfi64-extras.scm) = fd85d586dcc416a4eeac77bbbb5683b5ef6e8a43
+SHA1 (patch-bindings_guile_test_test-core-utils.scm) = 3b85bed9b105a8da8e512f74b1281f9f16a983e4
+SHA1 (patch-bindings_guile_test_test-gnc-optiondb.scm) = 189e42e79fd3d0f315af2dbb45067ab435b51ecc
+SHA1 (patch-gnucash_report_reports_standard_test_test-transaction.scm) = b229cba8a44215518e43e7f7c6032979a39dd7cb
+SHA1 (patch-gnucash_report_test_test-commodity-utils.scm) = 7e7042874ba091398e4b34be25bcb3e9621e06f7
+SHA1 (patch-gnucash_report_test_test-html-chart.scm) = 42627ef7a3237e1c8c2d8acf14e37df09408e947
+SHA1 (patch-gnucash_report_test_test-report-utilities.scm) = 6c85febc9f782f3707e5aed8c4a4e35b633776be
+SHA1 (patch-gnucash_report_test_test-report.scm) = d530365cdfd6de8bbd66de34234b858cc8dc33ff
Added files:
Index: pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_srfi64-extras.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_srfi64-extras.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_srfi64-extras.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-bindings_guile_test_srfi64-extras.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- bindings/guile/test/srfi64-extras.scm.orig 2024-11-12 02:02:44.000000000 +0000
++++ bindings/guile/test/srfi64-extras.scm
+@@ -34,11 +34,12 @@
+ (case (test-result-kind runner)
+ ((pass xpass) (set! num-passed (1+ num-passed)))
+ ((fail xfail)
+- (if (test-result-ref runner 'expected-value)
++ (if (not (equal? 'no (test-result-ref runner 'expected-value 'no)))
+ (format #t "~a\n -> expected: ~s\n -> obtained: ~s\n"
+ (string-join (test-runner-group-path runner) "/")
+ (test-result-ref runner 'expected-value)
+- (test-result-ref runner 'actual-value)))
++ (test-result-ref runner 'actual-value))
++ (format #t "~%~a~%" (test-result-alist runner)))
+ (set! num-failed (1+ num-failed)))
+ (else #t))))
+ (test-runner-on-final! runner
Index: pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-core-utils.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-core-utils.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-core-utils.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-bindings_guile_test_test-core-utils.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- bindings/guile/test/test-core-utils.scm.orig 2024-11-12 02:02:44.000000000 +0000
++++ bindings/guile/test/test-core-utils.scm
+@@ -42,7 +42,7 @@
+ "${symbol} does not exist"
+ (gnc:format "${symbol} does not exist" 'existence "none"))
+
+- (test-error "gnc:format syntax error"
++ (test-error "gnc:format syntax error" #t
+ (gnc:format "${symbol} does not exist" 'existence)))
+
+ (define (run-test)
Index: pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-gnc-optiondb.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-gnc-optiondb.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-bindings_guile_test_test-gnc-optiondb.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-bindings_guile_test_test-gnc-optiondb.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- bindings/guile/test/test-gnc-optiondb.scm.orig 2024-11-12 02:02:44.000000000 +0000
++++ bindings/guile/test/test-gnc-optiondb.scm
+@@ -115,7 +115,7 @@
+ option-db "waldo" "pepper" "baz"
+ "Phony Option" acctlist (list ACCT-TYPE-BANK))
+ (let ((acct-list (gnc-option-value option-db "waldo" "pepper")))
+- (test-equal #f (length acct-list))))))
++ (test-error 'wrong-type-arg (length acct-list))))))
+
+ (define (test-make-account-sel-limited-option book)
+ (test-group "test-make-account-list-option"
Index: pkgsrc/finance/gnucash/patches/patch-gnucash_report_reports_standard_test_test-transaction.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-gnucash_report_reports_standard_test_test-transaction.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-gnucash_report_reports_standard_test_test-transaction.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-gnucash_report_reports_standard_test_test-transaction.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- gnucash/report/reports/standard/test/test-transaction.scm.orig 2025-09-27 21:44:20.000000000 +0000
++++ gnucash/report/reports/standard/test/test-transaction.scm
+@@ -1067,7 +1067,7 @@
+ '(("from" "01/01/2010")
+ ("to" "31/12/2010")
+ ("total" 23500 30000 25/7 sym))))
+- (test-error "gnc:lists->csv improper list"
++ (test-error "gnc:lists->csv improper list" #t
+ (gnc:lists->csv
+ '(("from" "01/01/2010")
+ ("to" "31/12/2010")
Index: pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-commodity-utils.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-commodity-utils.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-commodity-utils.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,72 @@
+$NetBSD: patch-gnucash_report_test_test-commodity-utils.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- gnucash/report/test/test-commodity-utils.scm.orig 2024-11-12 02:02:45.000000000 +0000
++++ gnucash/report/test/test-commodity-utils.scm
+@@ -270,8 +270,8 @@
+ (let* ((sumlist (list (list USD (list (list AAPL aapl-col)))
+ (list GBP (list (list RDSA rdsa-gbp-col)))))
+ (return-alist (gnc:resolve-unknown-comm sumlist USD)))
+- (test-equal "RDSA #f" #f ((caadr (assoc RDSA return-alist)) 'total #f))
+- (test-equal "RDSA #f" #f ((cdadr (assoc RDSA return-alist)) 'total #f)))
++ (test-error "RDSA #f" 'wrong-type-arg (((assoc RDSA return-alist)) 'total #f))
++ (test-error "RDSA #f" 'wrong-type-arg ((cdadr (assoc RDSA return-alist)) 'total #f)))
+ (test-end "foreign-no-coll")
+ (test-begin "foreign-no-amount")
+ ;; There's a collector but it doesn't have a price in it so the returned
+@@ -348,8 +348,8 @@
+ (list GBP (list (list DEM gbp-dem-col)
+ (list RDSA rdsa-gbp-col)))))
+ (return-alist (gnc:resolve-unknown-comm sumlist USD)))
+- (test-equal "Shares fails" #f ((caadr (assoc RDSA return-alist)) 'total #f))
+- (test-equal "Value fails" #f ((cdadr (assoc RDSA return-alist)) 'total #f)))
++ (test-error "Shares fails" 'wrong-type-arg ((caadr (assoc RDSA return-alist)) 'total #f))
++ (test-error "Value fails" 'wrong-type-arg ((cdadr (assoc RDSA return-alist)) 'total #f)))
+ (test-end "foreign-3way-gbp->dem->eur->usd")
+ (test-begin "foreign-3way-DEM>GBP")
+ ;; Three-way conversion, gbp->dem->eur->usd
+@@ -359,8 +359,8 @@
+ (list DEM (list (list GBP dem-gbp-col)))
+ (list GBP (list (list RDSA rdsa-gbp-col)))))
+ (return-alist (gnc:resolve-unknown-comm sumlist USD)))
+- (test-equal "Shares fails" #f ((caadr (assoc RDSA return-alist)) 'total #f))
+- (test-equal "Value fails" #f ((cdadr (assoc RDSA return-alist)) 'total #f)))
++ (test-error "Shares fails" 'wrong-type-arg ((caadr (assoc RDSA return-alist)) 'total #f))
++ (test-error "Value fails" 'wrong-type-arg ((cdadr (assoc RDSA return-alist)) 'total #f)))
+ (test-end "foreign-3way-DEM>GBP")
+ (test-begin "foreign-DEM>EUR")
+ ;; Three-way conversion, gbp->dem->eur
+@@ -369,8 +369,8 @@
+ (list GBP (list (list DEM gbp-dem-col)
+ (list RDSA rdsa-gbp-col)))))
+ (return-alist (gnc:resolve-unknown-comm sumlist EUR)))
+- (test-equal "Shares fails" #f ((caadr (assoc RDSA return-alist)) 'total #f))
+- (test-equal "Value fails" #f ((cdadr (assoc RDSA return-alist)) 'total #f)))
++ (test-error "Shares fails" 'wrong-type-arg ((caadr (assoc RDSA return-alist)) 'total #f))
++ (test-error "Value fails" 'wrong-type-arg ((cdadr (assoc RDSA return-alist)) 'total #f)))
+ (test-end "foreign-DEM>EUR"))
+
+ (teardown)))
+@@ -753,9 +753,9 @@
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+- (gnc-dmy2time64-neutral 20 02 2012)))))
++ (gnc-dmy2time64-neutral 20 02 2012))))))
+
+- (teardown))))
++ (teardown)))
+
+ (define (test-get-match-commodity-splits-sorted)
+ (test-group-with-cleanup "test-get-match-commodity-splits-sorted"
+@@ -818,6 +818,6 @@
+ "2012-02-20" "2013-08-09" "2014-07-11" "2014-08-08"
+ "2014-08-08" "2014-12-05" "2014-12-05" "2015-04-02"
+ "2015-10-23" "2015-10-23" "2016-03-11" "2016-03-11")
+- (map split->date all-splits)))
++ (map split->date all-splits))))
+
+- (teardown))))
++ (teardown)))
Index: pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-html-chart.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-html-chart.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-html-chart.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,41 @@
+$NetBSD: patch-gnucash_report_test_test-html-chart.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- gnucash/report/test/test-html-chart.scm.orig 2024-11-12 02:02:45.000000000 +0000
++++ gnucash/report/test/test-html-chart.scm
+@@ -60,8 +60,8 @@
+ 'abc
+ (gnc:html-chart-get chart '(options maintainAspectRatio)))
+
+- (test-equal "path doesn't exist"
+- #f
++ (test-error "path doesn't exist"
++ #t
+ (gnc:html-chart-get chart '(options scales xAxes (0) time)))
+
+ (gnc:html-chart-set! chart '(options scales xAxes (0) time) a-list-of-pairs)
+@@ -77,11 +77,11 @@
+
+ (test-error
+ "1st level option fails - cannot traverse through existing path"
+- 'invalid-path
++ 'wrong-type-arg
+ (gnc:html-chart-set! chart '(options legend position invalid) 'de))
+
+- (test-equal "deep nested new path - inexistent"
+- #f
++ (test-error "deep nested new path - nonexistent"
++ 'invalid-path
+ (gnc:html-chart-get chart '(create new nested path)))
+
+ (gnc:html-chart-set! chart '(create new nested path) 'newpath)
+@@ -115,6 +115,6 @@
+
+ (test-error
+ "deep nested new path - cannot set 6th index"
+- 'error
++ 'index-too-high
+ (gnc:html-chart-set! chart '(create list-kth (6) nested path) 'k4th))
+ ))
Index: pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report-utilities.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report-utilities.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report-utilities.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-gnucash_report_test_test-report-utilities.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- gnucash/report/test/test-report-utilities.scm.orig 2025-08-03 21:16:36.000000000 +0000
++++ gnucash/report/test/test-report-utilities.scm
+@@ -483,8 +483,8 @@
+ (collector->list
+ (gnc:select-assoc-account-balance account-balances bank)))
+
+- (test-equal "gnc:select-assoc-account-balance - miss"
+- #f
++ (test-error "gnc:select-assoc-account-balance - miss"
++ 'wrong-type-arg
+ (collector->list
+ (gnc:select-assoc-account-balance account-balances expense)))
+
Index: pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report.scm
diff -u /dev/null pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report.scm:1.1
--- /dev/null Sun Dec 14 20:51:32 2025
+++ pkgsrc/finance/gnucash/patches/patch-gnucash_report_test_test-report.scm Sun Dec 14 20:51:32 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-gnucash_report_test_test-report.scm,v 1.1 2025/12/14 20:51:32 wiz Exp $
+
+Guile 3.0.11 compatibility.
+https://github.com/Gnucash/gnucash/pull/2158
+
+--- gnucash/report/test/test-report.scm.orig 2025-08-03 21:16:36.000000000 +0000
++++ gnucash/report/test/test-report.scm
+@@ -195,8 +195,8 @@
+ (test-equal "gnc:report-name"
+ "basic report"
+ (gnc:report-name report))
+- (test-equal "gnc:report-stylesheet"
+- #f
++ (test-error "gnc:report-stylesheet"
++ 'wrong-type-arg
+ (gnc:report-stylesheet report))
+ (test-equal "(gnc:all-report-template-guids)"
+ 4
Home |
Main Index |
Thread Index |
Old Index