From 9729279b4353a03ea41d7fccd4d797354ce5418d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 2 Apr 2021 08:31:52 +0000 Subject: [PATCH] Update to gnucash-4.5. --- productivity/gnucash/Makefile | 5 ++- productivity/gnucash/distinfo | 8 ++--- ...h-gnucash_gnome-search_search-reconciled_c | 17 ---------- ...atch-gnucash_gnome-utils_gnc-main-window_c | 4 +-- productivity/gnucash/pkg/PLIST | 34 ++++++++++++++++++- 5 files changed, 41 insertions(+), 27 deletions(-) delete mode 100644 productivity/gnucash/patches/patch-gnucash_gnome-search_search-reconciled_c diff --git a/productivity/gnucash/Makefile b/productivity/gnucash/Makefile index bcb946bc155..1134aea0f80 100644 --- a/productivity/gnucash/Makefile +++ b/productivity/gnucash/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.129 2021/03/12 16:37:58 naddy Exp $ +# $OpenBSD: Makefile,v 1.130 2021/04/02 08:31:52 ajacoutot Exp $ COMMENT = personal and small-business financial-accounting software GNOME_PROJECT = gnucash -GNOME_VERSION = 4.4 -REVISION = 0 +GNOME_VERSION = 4.5 EXTRACT_SUFX = .tar.bz2 DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/productivity/gnucash/distinfo b/productivity/gnucash/distinfo index 50fe91627f6..eb5120ca07a 100644 --- a/productivity/gnucash/distinfo +++ b/productivity/gnucash/distinfo @@ -1,4 +1,4 @@ -SHA256 (gnucash-4.4.tar.bz2) = 2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no= -SHA256 (gnucash-docs-4.4.tar.gz) = KYl3593c6DM14fmI5pd8sBDjeyicMdCbFd9K9SbkujU= -SIZE (gnucash-4.4.tar.bz2) = 14430959 -SIZE (gnucash-docs-4.4.tar.gz) = 62625808 +SHA256 (gnucash-4.5.tar.bz2) = vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w= +SHA256 (gnucash-docs-4.5.tar.gz) = kf0Er8jZtwDp8DQyGqeCtSrfE8VZ46lEEOB3TBgK+kM= +SIZE (gnucash-4.5.tar.bz2) = 14472274 +SIZE (gnucash-docs-4.5.tar.gz) = 71534508 diff --git a/productivity/gnucash/patches/patch-gnucash_gnome-search_search-reconciled_c b/productivity/gnucash/patches/patch-gnucash_gnome-search_search-reconciled_c deleted file mode 100644 index d23b8eceb17..00000000000 --- a/productivity/gnucash/patches/patch-gnucash_gnome-search_search-reconciled_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-gnucash_gnome-search_search-reconciled_c,v 1.1 2021/03/12 16:37:58 naddy Exp $ - -Work around new clang warning void-pointer-to-enum-cast. -https://github.com/Gnucash/gnucash/commit/228f145bba8f5e7b8647173d3d634de95b03c4bf - -Index: gnucash/gnome-search/search-reconciled.c ---- gnucash/gnome-search/search-reconciled.c.orig -+++ gnucash/gnome-search/search-reconciled.c -@@ -159,7 +159,7 @@ toggle_changed (GtkToggleButton *button, GNCSearchReco - { - gboolean is_on = gtk_toggle_button_get_active (button); - cleared_match_t value = -- (cleared_match_t) g_object_get_data (G_OBJECT (button), "button-value"); -+ (cleared_match_t) ((uint64_t)g_object_get_data (G_OBJECT (button), "button-value") & 0xffffffff); // Binary mask to silence void-pointer-to-enum-cast warning. - - if (is_on) - fe->value |= value; diff --git a/productivity/gnucash/patches/patch-gnucash_gnome-utils_gnc-main-window_c b/productivity/gnucash/patches/patch-gnucash_gnome-utils_gnc-main-window_c index 47dde1236d3..25f606ccbc1 100644 --- a/productivity/gnucash/patches/patch-gnucash_gnome-utils_gnc-main-window_c +++ b/productivity/gnucash/patches/patch-gnucash_gnome-utils_gnc-main-window_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-gnucash_gnome-utils_gnc-main-window_c,v 1.3 2021/01/09 12:02:43 ajacoutot Exp $ +$OpenBSD: patch-gnucash_gnome-utils_gnc-main-window_c,v 1.4 2021/04/02 08:31:52 ajacoutot Exp $ https://bugs.gnucash.org/show_bug.cgi?id=797921 error: result of comparison against a string literal is unspecified (use an explicit string comparison function instead) [-Werror,-Wstring-compare] @@ -6,7 +6,7 @@ error: result of comparison against a string literal is unspecified (use an expl Index: gnucash/gnome-utils/gnc-main-window.c --- gnucash/gnome-utils/gnc-main-window.c.orig +++ gnucash/gnome-utils/gnc-main-window.c -@@ -1502,7 +1502,14 @@ gnc_main_window_event_handler (QofInstance *entity, Q +@@ -1517,7 +1517,14 @@ gnc_main_window_event_handler (QofInstance *entity, Q g_return_if_fail(GNC_IS_MAIN_WINDOW(user_data)); /* soft failures */ diff --git a/productivity/gnucash/pkg/PLIST b/productivity/gnucash/pkg/PLIST index 4a55b5ead2b..dac59a538a3 100644 --- a/productivity/gnucash/pkg/PLIST +++ b/productivity/gnucash/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.52 2021/01/09 12:02:43 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.53 2021/04/02 08:31:52 ajacoutot Exp $ @conflict gnucash-docs-* @pkgpath productivity/gnucash-docs bin/gnc-fq-check @@ -477,6 +477,7 @@ lib/guile/2.2/site-ccache/gnucash/utilities.go @so lib/libgnucash-guile.so @man man/man1/gnc-fq-dump.1 @man man/man1/gnc-fq-helper.1 +@man man/man1/gnucash-cli.1 @man man/man1/gnucash.1 share/applications/gnucash.desktop share/doc/gnucash/ @@ -503,6 +504,7 @@ share/doc/gnucash/ChangeLog.2016 share/doc/gnucash/ChangeLog.2017 share/doc/gnucash/ChangeLog.2018 share/doc/gnucash/ChangeLog.2019 +share/doc/gnucash/ChangeLog.2020 share/doc/gnucash/DOCUMENTERS share/doc/gnucash/HACKING share/doc/gnucash/LICENSE @@ -611,6 +613,7 @@ share/gnome/help/gnucash-guide/de/ch_loans.xml share/gnome/help/gnucash-guide/de/ch_oth_assets.xml share/gnome/help/gnucash-guide/de/ch_oview.xml share/gnome/help/gnucash-guide/de/ch_python_bindings.xml +share/gnome/help/gnucash-guide/de/ch_reports.xml share/gnome/help/gnucash-guide/de/ch_txns.xml share/gnome/help/gnucash-guide/de/fdl-appendix.xml share/gnome/help/gnucash-guide/de/figures/ @@ -678,6 +681,35 @@ share/gnome/help/gnucash-guide/pt/figures/ share/gnome/help/gnucash-guide/pt/gnc-docbookx.dtd share/gnome/help/gnucash-guide/pt/gnucash-guide.xml share/gnome/help/gnucash-guide/pt/legal.xml +share/gnome/help/gnucash-guide/ru/ +share/gnome/help/gnucash-guide/ru/appendixa.xml +share/gnome/help/gnucash-guide/ru/appendixb.xml +share/gnome/help/gnucash-guide/ru/appendixc.xml +share/gnome/help/gnucash-guide/ru/appendixd.xml +share/gnome/help/gnucash-guide/ru/ch_accts.xml +share/gnome/help/gnucash-guide/ru/ch_basics.xml +share/gnome/help/gnucash-guide/ru/ch_budgets.xml +share/gnome/help/gnucash-guide/ru/ch_bus_features.xml +share/gnome/help/gnucash-guide/ru/ch_capgain.xml +share/gnome/help/gnucash-guide/ru/ch_cbook.xml +share/gnome/help/gnucash-guide/ru/ch_cc.xml +share/gnome/help/gnucash-guide/ru/ch_currency.xml +share/gnome/help/gnucash-guide/ru/ch_dep.xml +share/gnome/help/gnucash-guide/ru/ch_expenses.xml +share/gnome/help/gnucash-guide/ru/ch_import_business_data.xml +share/gnome/help/gnucash-guide/ru/ch_invest.xml +share/gnome/help/gnucash-guide/ru/ch_loans.xml +share/gnome/help/gnucash-guide/ru/ch_oth_assets.xml +share/gnome/help/gnucash-guide/ru/ch_oview.xml +share/gnome/help/gnucash-guide/ru/ch_python_bindings.xml +share/gnome/help/gnucash-guide/ru/ch_reports.xml +share/gnome/help/gnucash-guide/ru/ch_txns.xml +share/gnome/help/gnucash-guide/ru/fdl-appendix.xml +share/gnome/help/gnucash-guide/ru/figures/ +share/gnome/help/gnucash-guide/ru/gnc-docbookx.dtd +share/gnome/help/gnucash-guide/ru/gnc-glossary.xml +share/gnome/help/gnucash-guide/ru/gnucash-guide.xml +share/gnome/help/gnucash-guide/ru/legal.xml share/gnome/help/gnucash-help/ share/gnome/help/gnucash-help/C/ share/gnome/help/gnucash-help/C/Help_ch_Account-Actions.xml