Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Wed, 29 Mar 2023 06:50:02 UTC
Severity: normal
Tags: patch
Done: Leo Famulari <leo <at> famulari.name>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62514 in the body.
You can then email your comments to 62514 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Wed, 29 Mar 2023 06:50:02 GMT) Full text and rfc822 format available.Andy Tai <atai <at> atai.org>:guix-patches <at> gnu.org.
(Wed, 29 Mar 2023 06:50:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: guix-patches <at> gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH] gnu: gnucash: Update to 5.0 Date: Tue, 28 Mar 2023 23:49:01 -0700
* gnu/packages/gnucash.scm (gnucash): Update to 5.0
---
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: c9af27d4ca733b20f09019f1465d3e5fdc1ec724
--
2.39.2
guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Wed, 29 Mar 2023 18:45:02 GMT) Full text and rfc822 format available.Message #8 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Andy Tai <atai <at> atai.org> Cc: 62514 <at> debbugs.gnu.org Subject: Re: bug#62514: [PATCH] gnu: gnucash: Update to 5.0 Date: Wed, 29 Mar 2023 14:44:30 -0400
Hello!
Andy Tai <atai <at> atai.org> writes:
> * gnu/packages/gnucash.scm (gnucash): Update to 5.0
Please expound commit message according to the GNU ChangeLog style;
refer to oher commits or 'info (standards) Change Logs' for more information.
> ---
> 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))))
This should be done in a phase instead; note that returning #t is no
longer needed :-).
> (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\" ") ""))))
Why is this no longer needed?
> ;; 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"))))
>
Why is this done?
> (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))
Is there a Texinfo manual for Gnucash? That'd be neat.
--
Thanks,
Maxim
guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Tue, 04 Apr 2023 01:47:01 GMT) Full text and rfc822 format available.Message #11 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 62514 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: gnucash: Update to 5.0 Date: Mon, 3 Apr 2023 18:45:58 -0700
I will not have time to address this in the next week or so, so feel free to update the patch in resp. to the comments or if no one come forward to adores it I will try to get back to this the second half of April.
Christopher Baines <mail <at> cbaines.net>
to control <at> debbugs.gnu.org.
(Thu, 13 Apr 2023 16:34:01 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Fri, 14 Apr 2023 16:00:03 GMT) Full text and rfc822 format available.Message #16 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 62514 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v2] gnu: gnucash: Update to 5.0 Date: Fri, 14 Apr 2023 08:59:29 -0700
* 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
Andy Tai <atai <at> atai.org>
to control <at> debbugs.gnu.org.
(Fri, 14 Apr 2023 16:03:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Tue, 18 Apr 2023 05:18:02 GMT) Full text and rfc822 format available.Message #21 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 62514 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v3] gnu: gnucash: Update to 5.0 Date: Mon, 17 Apr 2023 22:17:29 -0700
* gnu/packages/gnucash.scm (gnucash): Update to 5.0
[arguments]<phase>: Patch out unsupported tests.
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 | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 0386910ce6..6fe63f487e 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,14 @@ (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"))))
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(arguments
@@ -87,6 +88,13 @@ (define-public gnucash
(guix build utils))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-unsupported-test
+ ;; test test-gnc-quotes neeeds perl JSON::Parse
+ ;; not packaged in Guix yet
+ (lambda _
+ (substitute* "libgnucash/app-utils/test/CMakeLists.txt"
+ (("gnc_add_test\\(test-gnc-quotes")
+ "#gnc_add_test\\(test-gnc-quotes"))))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
@@ -95,12 +103,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 +157,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 +217,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 +226,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: 9a5e1dc1f16f5f8c056e64f2077b035784003673
prerequisite-patch-id: 2fe043491619f0182074f836ad7b0c91f725637e
--
2.39.2
guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Tue, 18 Apr 2023 05:41:01 GMT) Full text and rfc822 format available.Message #24 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 62514 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v4] gnu: gnucash: Update to 5.0 Date: Mon, 17 Apr 2023 22:40:07 -0700
* gnu/packages/gnucash.scm (gnucash): Update to 5.0
[arguments]<phase>: Patch out unsupported tests.
Remove references in patching code to removed source
files upstream
* gnu/packages/gnucash.scm (gnucash-doc): Update to 5.0
---
gnu/packages/gnucash.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 0386910ce6..54a7cc0969 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,14 @@ (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"))))
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(arguments
@@ -87,6 +88,13 @@ (define-public gnucash
(guix build utils))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-unsupported-test
+ ;; test test-gnc-quotes neeeds perl JSON::Parse
+ ;; not packaged in Guix yet
+ (lambda _
+ (substitute* "libgnucash/app-utils/test/CMakeLists.txt"
+ (("gnc_add_test\\(test-gnc-quotes")
+ "#gnc_add_test\\(test-gnc-quotes"))))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
@@ -95,12 +103,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 +157,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 +217,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.
base-commit: 9a5e1dc1f16f5f8c056e64f2077b035784003673
prerequisite-patch-id: 2fe043491619f0182074f836ad7b0c91f725637e
--
2.39.2
guix-patches <at> gnu.org:bug#62514; Package guix-patches.
(Tue, 18 Apr 2023 05:47:01 GMT) Full text and rfc822 format available.Message #27 received at 62514 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 62514 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v5] gnu: gnucash: Update to 5.0 Date: Mon, 17 Apr 2023 22:46:04 -0700
* gnu/packages/gnucash.scm (gnucash): Update to 5.0
[arguments]<phase>: Patch out unsupported tests.
Remove references in patching code to removed source
files upstream
* gnu/packages/gnucash.scm (gnucash-doc): Update to 5.0
---
gnu/packages/gnucash.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 0386910ce6..ddc78a655e 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -64,14 +64,14 @@ (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"))))
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(arguments
@@ -87,6 +87,13 @@ (define-public gnucash
(guix build utils))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-unsupported-test
+ ;; test test-gnc-quotes neeeds perl JSON::Parse
+ ;; not packaged in Guix yet
+ (lambda _
+ (substitute* "libgnucash/app-utils/test/CMakeLists.txt"
+ (("gnc_add_test\\(test-gnc-quotes")
+ "#gnc_add_test\\(test-gnc-quotes"))))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
@@ -95,12 +102,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 +156,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 +216,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.
base-commit: 9a5e1dc1f16f5f8c056e64f2077b035784003673
prerequisite-patch-id: 2fe043491619f0182074f836ad7b0c91f725637e
--
2.39.2
Leo Famulari <leo <at> famulari.name>:Andy Tai <atai <at> atai.org>:Message #32 received at 62514-done <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Andy Tai <atai <at> atai.org> Cc: 62514-done <at> debbugs.gnu.org Subject: Re: [bug#62514] [PATCH v5] gnu: gnucash: Update to 5.0 Date: Sun, 23 Apr 2023 11:18:52 -0400
On Mon, Apr 17, 2023 at 10:46:04PM -0700, Andy Tai wrote: > * gnu/packages/gnucash.scm (gnucash): Update to 5.0 > [arguments]<phase>: Patch out unsupported tests. > Remove references in patching code to removed source > files upstream > > * gnu/packages/gnucash.scm (gnucash-doc): Update to 5.0 Thanks! Pushed as 2f18babcd33406d21cc69042c6b0cac42d2c4526
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 22 May 2023 11:24:05 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.