From: Andy Tai <atai@atai.org>
To: 62514@debbugs.gnu.org
Cc: Andy Tai <atai@atai.org>
Subject: [bug#62514] [PATCH v2] gnu: gnucash: Update to 5.0
Date: Fri, 14 Apr 2023 08:59:29 -0700 [thread overview]
Message-ID: <20230414155929.14547-1-atai@atai.org> (raw)
In-Reply-To: <20230329064901.13800-1-atai@atai.org>
* gnu/packages/gnucash.scm (gnucash): Update to 5.0
[source]: Patch out unsupported tests
[arguments]<phase>: Remove references in
patching code to removed source files upstream
* gnu/packages/gnucash.scm (gnucash-doc): Update to 5.0
[native-inputs]: Add texinfo per upstream build doc
---
gnu/packages/gnucash.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 0386910ce6..dde21aa43d 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages gnucash)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages swig)
+ #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
@@ -64,14 +65,24 @@ (define-public gnucash
;; directory.
(package
(name "gnucash")
- (version "4.11")
+ (version "5.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-" version ".tar.bz2"))
(sha256
- (base32 "069b216dkpjs9hp32s4bhi6f76lbc81qvbmjmz0dxq3v1piys57q"))))
+ (base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; test test-gnc-quotes neeeds perl JSON::Parse
+ ;; not packaged in Guix yet
+ '(begin
+ (substitute* "libgnucash/app-utils/test/CMakeLists.txt"
+ (("gnc_add_test\\(test-gnc-quotes")
+ "#gnc_add_test\\(test-gnc-quotes"))
+ #t))))
+
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(arguments
@@ -95,12 +106,6 @@ (define-public gnucash
(substitute* "CMakeLists.txt"
(("set\\(SHELL /bin/bash\\)")
(string-append "set(SHELL " (which "bash") ")")))))
- ;; After wrapping gnc-fq-check and gnc-fq-helper we can no longer
- ;; execute them with perl, so execute them directly instead.
- (add-after 'unpack 'fix-finance-quote-check
- (lambda _
- (substitute* "gnucash/price-quotes.scm"
- (("\"perl\" \"-w\" ") ""))))
;; The qof test requires the en_US, en_GB, and fr_FR locales.
(add-before 'check 'install-locales
(lambda _
@@ -155,9 +160,7 @@ (define-public gnucash
(assoc l (package-inputs this-package)))
'("perl-finance-quote")))))))))
'("gnucash"
- "gnc-fq-check"
- "gnc-fq-helper"
- "gnc-fq-dump"))))
+ "gnc-fq-update"))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'install 'glib-or-gtk-wrap
@@ -217,7 +220,7 @@ (define gnucash-docs
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-docs-" version revision ".tar.gz"))
(sha256
- (base32 "162qq8p76grczdnsd4qbpxn1d8ap6l2n1a00a601v5hij7rqwfx8"))))
+ (base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882"))))
(build-system cmake-build-system)
;; These are native-inputs because they are only required for building the
;; documentation.
@@ -226,9 +229,11 @@ (define gnucash-docs
;; XML during the tests.
(list docbook-xml
docbook-xsl
+ libsecret
libxml2
libxslt
- scrollkeeper))
+ scrollkeeper
+ texinfo))
(arguments
`(#:tests? #f)) ;no test target
(home-page "https://www.gnucash.org/")
base-commit: fcb9ba2e71ed1e7af1f1c3ee51da639ba9483ec3
--
2.39.2
next prev parent reply other threads:[~2023-04-14 16:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 6:49 [bug#62514] [PATCH] gnu: gnucash: Update to 5.0 Andy Tai
2023-03-29 18:44 ` Maxim Cournoyer
2023-04-04 1:45 ` Andy Tai
2023-04-14 15:59 ` Andy Tai [this message]
2023-04-18 5:17 ` [bug#62514] [PATCH v3] " Andy Tai
2023-04-18 5:40 ` [bug#62514] [PATCH v4] " Andy Tai
2023-04-18 5:46 ` [bug#62514] [PATCH v5] " Andy Tai
2023-04-23 15:18 ` bug#62514: " Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230414155929.14547-1-atai@atai.org \
--to=atai@atai.org \
--cc=62514@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).