finance/gnucash: Update to 5.7

- Remove upstreamed patch.

4 files changed, 121 insertions, 129 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 975f3e4c8208..121bfe08b48d 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gnucash
-PORTVERSION=	5.6
+PORTVERSION=	5.7
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 932b68b773df..109df75fe1c8 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711954483
-SHA256 (gnucash-5.6.tar.bz2) = b4b42c626350f3e79f7ca1f2173545cc63ddee1addf2460b1a1f22221bf21bd1
-SIZE (gnucash-5.6.tar.bz2) = 15110621
+TIMESTAMP = 1719770435
+SHA256 (gnucash-5.7.tar.bz2) = bdd09df26e0863b3b1b09d6e5ea469ad0224b04691380c6c794c76e51fbae702
+SIZE (gnucash-5.7.tar.bz2) = 14988224
diff --git a/finance/gnucash/files/patch-gnucash_import-export_import-main-matcher.cpp b/finance/gnucash/files/patch-gnucash_import-export_import-main-matcher.cpp
deleted file mode 100644
index dc497bda9c0d..000000000000
--- a/finance/gnucash/files/patch-gnucash_import-export_import-main-matcher.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnucash/import-export/import-main-matcher.cpp.orig	2024-03-29 20:42:22 UTC
-+++ gnucash/import-export/import-main-matcher.cpp
-@@ -847,7 +847,7 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb 
-     bool is_selection = true;
-     auto debugging_enabled{qof_log_check (G_LOG_DOMAIN, QOF_LOG_DEBUG)};
- 
--    DEBUG("Rows in selection = %ld", selected_refs.size());
-+    DEBUG("Rows in selection = %zu", selected_refs.size());
- 
-     for (const auto& ref : selected_refs)
-     {
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index c3396d9b0946..2fab8bba71d1 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -5,13 +5,15 @@ bin/gnucash-cli
 bin/gnucash-valgrind
 %%ETCDIR%%/environment
 include/gnucash/Account.h
+include/gnucash/Account.hpp
 include/gnucash/FreqSpec.h
 include/gnucash/Query.h
 include/gnucash/QuickFill.h
 include/gnucash/Recurrence.h
 include/gnucash/SX-book.h
-include/gnucash/SX-ttinfo.h
+include/gnucash/SX-ttinfo.hpp
 include/gnucash/SchedXaction.h
+include/gnucash/SchedXaction.hpp
 include/gnucash/Scrub.h
 include/gnucash/Scrub2.h
 include/gnucash/Scrub3.h
@@ -191,7 +193,6 @@ include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
 include/gnucash/qofbook.hpp
 include/gnucash/qofbookslots.h
-include/gnucash/qofchoice.h
 include/gnucash/qofclass.h
 include/gnucash/qofevent.h
 include/gnucash/qofid-p.h
@@ -1010,118 +1011,120 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/tip_of_the_day.list
 %%DATADIR%%/ui/accelerator-map
 %%DATADIR%%/ui/accelerator-map-osx
-share/guile/site/%%GUILE_VER%%/gnucash/app-utils.scm
-share/guile/site/%%GUILE_VER%%/gnucash/app-utils/c-interface.scm
-share/guile/site/%%GUILE_VER%%/gnucash/app-utils/date-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/app-utils/fin.scm
-share/guile/site/%%GUILE_VER%%/gnucash/core-utils.scm
-share/guile/site/%%GUILE_VER%%/gnucash/deprecated/gnucash/deprecated-module.scm
-share/guile/site/%%GUILE_VER%%/gnucash/deprecated/gnucash/superseded-module.scm
-share/guile/site/%%GUILE_VER%%/gnucash/eguile.scm
-share/guile/site/%%GUILE_VER%%/gnucash/eguile/eguile-html-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/eguile/eguile-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/engine.scm
-share/guile/site/%%GUILE_VER%%/gnucash/engine/business-core.scm
-share/guile/site/%%GUILE_VER%%/gnucash/engine/gnc-numeric.scm
-share/guile/site/%%GUILE_VER%%/gnucash/gnome-utils.scm
-share/guile/site/%%GUILE_VER%%/gnucash/gnome-utils/gnc-menu-extensions.scm
-share/guile/site/%%GUILE_VER%%/gnucash/html.scm
-share/guile/site/%%GUILE_VER%%/gnucash/json.scm
-share/guile/site/%%GUILE_VER%%/gnucash/json/builder.scm
-share/guile/site/%%GUILE_VER%%/gnucash/json/parser.scm
-share/guile/site/%%GUILE_VER%%/gnucash/json/syntax.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/de_DE/tax.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/de_DE/tax/txf-help.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/de_DE/tax/txf.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/us/tax.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/us/tax/txf-help.scm
-share/guile/site/%%GUILE_VER%%/gnucash/locale/us/tax/txf.scm
-share/guile/site/%%GUILE_VER%%/gnucash/options.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-dialog-utils.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-file.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-guess-map.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-merge-groups.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-objects.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-parse.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-to-gnc.scm
-share/guile/site/%%GUILE_VER%%/gnucash/qif-import/qif-utils.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report-menus.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/commodity-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-acct-table.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-anytag.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-chart.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-document.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-fonts.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-style-info.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-style-sheet.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-table.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-text.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/html-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/options-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/report-core.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/report-register-hooks.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/report-utilities.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/stylesheets/css.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/stylesheets/footer.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/stylesheets/head-or-tail.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/stylesheets/plain.scm
-share/guile/site/%%GUILE_VER%%/gnucash/report/trep-engine.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/cash-flow-calc.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/example/average-balance.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/example/daily-reports.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/example/sample-graphs.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/example/sample-report.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/locale-specific/de_DE/taxtxf.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/locale-specific/us/taxtxf.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/account-piecharts.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/account-summary.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/advanced-portfolio.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/balance-forecast.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/balance-sheet.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/balsheet-eg.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/balsheet-pnl.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/budget-balance-sheet.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/budget-barchart.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/budget-flow.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/budget-income-statement.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/budget.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/cash-flow.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/cashflow-barchart.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/category-barchart.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/customer-summary.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/dashboard.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/equity-statement.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/general-journal.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/general-ledger.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/ifrs-cost-basis.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/income-gst-statement.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/income-statement.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/investment-lots.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/invoice.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/lot-viewer.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/net-charts.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/new-aging.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/new-owner-report.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/portfolio.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/price-scatter.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/receipt.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/reconcile-report.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/register.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/taxinvoice.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/transaction.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/trial-balance.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/standard/view-column.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/stylesheets/balsheet-eg.css
-share/guile/site/%%GUILE_VER%%/gnucash/reports/stylesheets/receipt.css
-share/guile/site/%%GUILE_VER%%/gnucash/reports/stylesheets/taxinvoice.css
-share/guile/site/%%GUILE_VER%%/gnucash/reports/templates/balsheet-eg.eguile.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/templates/receipt.eguile.scm
-share/guile/site/%%GUILE_VER%%/gnucash/reports/templates/taxinvoice.eguile.scm
-share/guile/site/%%GUILE_VER%%/gnucash/string.scm
-share/guile/site/%%GUILE_VER%%/gnucash/utilities.scm
+%%GUILE_SITE%%/gnucash/app-utils.scm
+%%GUILE_SITE%%/gnucash/app-utils/c-interface.scm
+%%GUILE_SITE%%/gnucash/app-utils/date-utilities.scm
+%%GUILE_SITE%%/gnucash/app-utils/fin.scm
+%%GUILE_SITE%%/gnucash/core-utils.scm
+%%GUILE_SITE%%/gnucash/deprecated/gnucash/deprecated-module.scm
+%%GUILE_SITE%%/gnucash/deprecated/gnucash/superseded-module.scm
+%%GUILE_SITE%%/gnucash/eguile.scm
+%%GUILE_SITE%%/gnucash/eguile/eguile-html-utilities.scm
+%%GUILE_SITE%%/gnucash/eguile/eguile-utilities.scm
+%%GUILE_SITE%%/gnucash/engine.scm
+%%GUILE_SITE%%/gnucash/engine/business-core.scm
+%%GUILE_SITE%%/gnucash/engine/gnc-numeric.scm
+%%GUILE_SITE%%/gnucash/gnome-utils.scm
+%%GUILE_SITE%%/gnucash/gnome-utils/gnc-menu-extensions.scm
+%%GUILE_SITE%%/gnucash/html.scm
+%%GUILE_SITE%%/gnucash/json.scm
+%%GUILE_SITE%%/gnucash/json/builder.scm
+%%GUILE_SITE%%/gnucash/json/parser.scm
+%%GUILE_SITE%%/gnucash/json/syntax.scm
+%%GUILE_SITE%%/gnucash/locale/de_DE/tax.scm
+%%GUILE_SITE%%/gnucash/locale/de_DE/tax/txf-help.scm
+%%GUILE_SITE%%/gnucash/locale/de_DE/tax/txf.scm
+%%GUILE_SITE%%/gnucash/locale/us/tax.scm
+%%GUILE_SITE%%/gnucash/locale/us/tax/txf-help.scm
+%%GUILE_SITE%%/gnucash/locale/us/tax/txf.scm
+%%GUILE_SITE%%/gnucash/options.scm
+%%GUILE_SITE%%/gnucash/qif-import.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-dialog-utils.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-file.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-guess-map.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-merge-groups.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-objects.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-parse.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-to-gnc.scm
+%%GUILE_SITE%%/gnucash/qif-import/qif-utils.scm
+%%GUILE_SITE%%/gnucash/report-menus.scm
+%%GUILE_SITE%%/gnucash/report.scm
+%%GUILE_SITE%%/gnucash/report/commodity-utilities.scm
+%%GUILE_SITE%%/gnucash/report/html-acct-table.scm
+%%GUILE_SITE%%/gnucash/report/html-anytag.scm
+%%GUILE_SITE%%/gnucash/report/html-chart.scm
+%%GUILE_SITE%%/gnucash/report/html-document.scm
+%%GUILE_SITE%%/gnucash/report/html-fonts.scm
+%%GUILE_SITE%%/gnucash/report/html-style-info.scm
+%%GUILE_SITE%%/gnucash/report/html-style-sheet.scm
+%%GUILE_SITE%%/gnucash/report/html-table.scm
+%%GUILE_SITE%%/gnucash/report/html-text.scm
+%%GUILE_SITE%%/gnucash/report/html-utilities.scm
+%%GUILE_SITE%%/gnucash/report/options-utilities.scm
+%%GUILE_SITE%%/gnucash/report/report-core.scm
+%%GUILE_SITE%%/gnucash/report/report-register-hooks.scm
+%%GUILE_SITE%%/gnucash/report/report-utilities.scm
+%%GUILE_SITE%%/gnucash/report/stylesheets/css.scm
+%%GUILE_SITE%%/gnucash/report/stylesheets/footer.scm
+%%GUILE_SITE%%/gnucash/report/stylesheets/head-or-tail.scm
+%%GUILE_SITE%%/gnucash/report/stylesheets/plain.scm
+%%GUILE_SITE%%/gnucash/report/trep-engine.scm
+%%GUILE_SITE%%/gnucash/reports.scm
+%%GUILE_SITE%%/gnucash/reports/cash-flow-calc.scm
+%%GUILE_SITE%%/gnucash/reports/example/average-balance.scm
+%%GUILE_SITE%%/gnucash/reports/example/daily-reports.scm
+%%GUILE_SITE%%/gnucash/reports/example/sample-graphs.scm
+%%GUILE_SITE%%/gnucash/reports/example/sample-report.scm
+%%GUILE_SITE%%/gnucash/reports/locale-specific/de_DE/taxtxf.scm
+%%GUILE_SITE%%/gnucash/reports/locale-specific/us/taxtxf.scm
+%%GUILE_SITE%%/gnucash/reports/standard/account-piecharts.scm
+%%GUILE_SITE%%/gnucash/reports/standard/account-summary.scm
+%%GUILE_SITE%%/gnucash/reports/standard/advanced-portfolio.scm
+%%GUILE_SITE%%/gnucash/reports/standard/balance-forecast.scm
+%%GUILE_SITE%%/gnucash/reports/standard/balance-sheet.scm
+%%GUILE_SITE%%/gnucash/reports/standard/balsheet-eg.scm
+%%GUILE_SITE%%/gnucash/reports/standard/balsheet-pnl.scm
+%%GUILE_SITE%%/gnucash/reports/standard/budget-balance-sheet.scm
+%%GUILE_SITE%%/gnucash/reports/standard/budget-barchart.scm
+%%GUILE_SITE%%/gnucash/reports/standard/budget-flow.scm
+%%GUILE_SITE%%/gnucash/reports/standard/budget-income-statement.scm
+%%GUILE_SITE%%/gnucash/reports/standard/budget.scm
+%%GUILE_SITE%%/gnucash/reports/standard/cash-flow.scm
+%%GUILE_SITE%%/gnucash/reports/standard/cashflow-barchart.scm
+%%GUILE_SITE%%/gnucash/reports/standard/category-barchart.scm
+%%GUILE_SITE%%/gnucash/reports/standard/customer-summary.scm
+%%GUILE_SITE%%/gnucash/reports/standard/dashboard.scm
+%%GUILE_SITE%%/gnucash/reports/standard/equity-statement.scm
+%%GUILE_SITE%%/gnucash/reports/standard/general-journal.scm
+%%GUILE_SITE%%/gnucash/reports/standard/general-ledger.scm
+%%GUILE_SITE%%/gnucash/reports/standard/ifrs-cost-basis.scm
+%%GUILE_SITE%%/gnucash/reports/standard/income-gst-statement.scm
+%%GUILE_SITE%%/gnucash/reports/standard/income-statement.scm
+%%GUILE_SITE%%/gnucash/reports/standard/investment-lots.scm
+%%GUILE_SITE%%/gnucash/reports/standard/invoice.scm
+%%GUILE_SITE%%/gnucash/reports/standard/lot-viewer.scm
+%%GUILE_SITE%%/gnucash/reports/standard/net-charts.scm
+%%GUILE_SITE%%/gnucash/reports/standard/new-aging.scm
+%%GUILE_SITE%%/gnucash/reports/standard/new-owner-report.scm
+%%GUILE_SITE%%/gnucash/reports/standard/portfolio.scm
+%%GUILE_SITE%%/gnucash/reports/standard/price-scatter.scm
+%%GUILE_SITE%%/gnucash/reports/standard/receipt.scm
+%%GUILE_SITE%%/gnucash/reports/standard/reconcile-report.scm
+%%GUILE_SITE%%/gnucash/reports/standard/register.scm
+%%GUILE_SITE%%/gnucash/reports/standard/taxinvoice.scm
+%%GUILE_SITE%%/gnucash/reports/standard/transaction.scm
+%%GUILE_SITE%%/gnucash/reports/standard/trial-balance.scm
+%%GUILE_SITE%%/gnucash/reports/standard/txn-columns.scm
+%%GUILE_SITE%%/gnucash/reports/standard/view-column.scm
+%%GUILE_SITE%%/gnucash/reports/stylesheets/balsheet-eg.css
+%%GUILE_SITE%%/gnucash/reports/stylesheets/receipt.css
+%%GUILE_SITE%%/gnucash/reports/stylesheets/taxinvoice.css
+%%GUILE_SITE%%/gnucash/reports/templates/balsheet-eg.eguile.scm
+%%GUILE_SITE%%/gnucash/reports/templates/receipt.eguile.scm
+%%GUILE_SITE%%/gnucash/reports/templates/taxinvoice.eguile.scm
+%%GUILE_SITE%%/gnucash/string.scm
+%%GUILE_SITE%%/gnucash/utilities.scm
+%%GUILE_SITE_CCACHE%%/gnucash/reports/standard/txn-columns.go
 share/icons/hicolor/128x128/apps/gnucash-icon.png
 share/icons/hicolor/16x16/apps/gnucash-icon.png
 share/icons/hicolor/22x22/apps/gnucash-icon.png