From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 04 23:38:06 2019 Received: (at submit) by debbugs.gnu.org; 5 Jan 2019 04:38:06 +0000 Received: from localhost ([127.0.0.1]:47180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfdin-0007kU-5h for submit@debbugs.gnu.org; Fri, 04 Jan 2019 23:38:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfdil-0007kN-EV for submit@debbugs.gnu.org; Fri, 04 Jan 2019 23:38:04 -0500 Received: from listsout.gnu.org ([208.118.235.17]:41493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gfdik-0001fe-Vj for submit@debbugs.gnu.org; Fri, 04 Jan 2019 23:38:03 -0500 Received: from eggsout.gnu.org ([209.51.188.92]:43014 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfdii-0004X6-Gq for guix-patches@gnu.org; Fri, 04 Jan 2019 23:38:02 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfdif-0001dY-Au for guix-patches@gnu.org; Fri, 04 Jan 2019 23:38:00 -0500 Received: from mail-it1-x141.google.com ([2607:f8b0:4864:20::141]:53597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfdie-0001cP-Uy for guix-patches@gnu.org; Fri, 04 Jan 2019 23:37:57 -0500 Received: by mail-it1-x141.google.com with SMTP id g85so4346829ita.3 for ; Fri, 04 Jan 2019 20:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=QMxybMZh2VKzv8Hg/2S77m7hNjZJmasdaBGqWnDts7w=; b=RZSpyfMAQAfUSmtos3GnTur+mdr+HDXqpUJozAvA/jPE214+yztG3OPv0812Tu4G2z X9nfMGoXN6IvD/280tSgpVhuXrE0kqjK9FmEtqXpCEVwOGPMIfu7XMuQnyyodbo7w6QL C5qhFB4ycTtreJ6Sl88YVwA13qHqFcsOvtxCugayMCeNwoSX1EJByxSTiaGpjCv9/Wqw rWRXPysGz811GDK/yNwSNUiS1jG6HuoFcmlCFIDrLJAbLFS8KETcgxSJgOHbc04zPfmL yfq9/WtMuh/i7nKS2hSErMtaab9uHjnyliBt5MDatQ2yfl3ZD2aTtd4o8G09M99PrStw li0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=QMxybMZh2VKzv8Hg/2S77m7hNjZJmasdaBGqWnDts7w=; b=SyE4KGVaKj7pZ/00FrviVxfAp9nOgtWLi/K3Z328fW0PJizyJTOfXVPWvCISAJgA6l /Co9MMKPWJICJHdtH2T+cPTM1+QjZy98a8Exl8HkxwNSKYEkoa7qCCN164ZEyLt/GCbW sqM9Fvi4/y/TfEwLdDkqKPpo6+SYvbQCljJH9vu/6inkJFGeNLnfjJyFnfPEF6vnhibI 9cjPeeANQJ5zGbXUk6uR/vgLCP2E+gD1GbI8JHcJO2xBGUvtk2WdPs03qSBurnnK9cEC MJUEO9v6jFnsZ62WaCDr11jIUedf6ErNr/ifZmPZ10Zd8/7yhxOfmP8CR7tBBjbWURbM ZHyw== X-Gm-Message-State: AJcUukeKtOT79HrVPVq5aSSUbpXfwiKIIGxpkVnPqRbcyHTA7+EVdiVj GDzMypFrXbLnBYRvkeaiGdRCkFen X-Google-Smtp-Source: ALg8bN6cYfe/5KwmkjtcELXFYwqRUTIZvgueYtID3F5NSkA8yD96b8mU2X6yhiZMDqmO4+JRdjsbSw== X-Received: by 2002:a24:d6:: with SMTP id 205mr2212343ita.99.1546663075904; Fri, 04 Jan 2019 20:37:55 -0800 (PST) Received: from apteryx ([157.52.5.144]) by smtp.gmail.com with ESMTPSA id x21sm26645888iob.84.2019.01.04.20.37.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jan 2019 20:37:55 -0800 (PST) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer To: guix-patches Subject: [PATCH] Update GnuCash to v3.4 and other improvements Date: Fri, 04 Jan 2019 23:37:53 -0500 Message-ID: <87pntbpvmm.fsf@apteryx.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::141 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain Hello, This patch series improve our GnuCash package so that it relies less on patches (which are harder to maintain), updates it to the latest 3.4 version, as well as clarify how the documentation output can be used. Thanks, Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnucash-Fix-indentation.patch >From 3cd00d36f2a43191906c1e89d1138b9f459b29b9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 17:18:23 -0500 Subject: [PATCH 1/5] gnu: gnucash: Fix indentation. * gnu/packages/gnucash.scm (gnucash): Fix indentation. --- gnu/packages/gnucash.scm | 96 ++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index b54623387..e85a538c4 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -54,15 +54,15 @@ (version "3.3") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" - version "/gnucash-" version ".tar.bz2")) - (sha256 - (base32 - "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) - (patches (search-patches "gnucash-price-quotes-perl.patch" - "gnucash-disable-failing-tests.patch" - "gnucash-fix-test-transaction-failure.patch")))) + (method url-fetch) + (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" + version "/gnucash-" version ".tar.bz2")) + (sha256 + (base32 + "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) + (patches (search-patches "gnucash-price-quotes-perl.patch" + "gnucash-disable-failing-tests.patch" + "gnucash-fix-test-transaction-failure.patch")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -79,7 +79,7 @@ ("perl-finance-quote" ,perl-finance-quote) ("tzdata" ,tzdata-for-tests))) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-schemas, etc. + `(("glib" ,glib "bin") ; glib-compile-schemas, etc. ("intltool" ,intltool) ("googlemock" ,(package-source googletest)) ("googletest" ,googletest) @@ -89,8 +89,8 @@ (arguments `(#:test-target "check" #:configure-flags - (list "-DWITH_OFX=OFF" ; libofx is not available yet - "-DWITH_SQL=OFF") ; without dbi.h + (list "-DWITH_OFX=OFF" ; libofx is not available yet + "-DWITH_SQL=OFF") ; without dbi.h #:make-flags '("GUILE_AUTO_COMPILE=0") #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -120,43 +120,41 @@ (string-append "set(SHELL " (which "bash") ")"))) #t))) ;; There are about 100 megabytes of documentation. - (add-after - 'install 'install-docs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((docs (assoc-ref inputs "gnucash-docs")) - (doc-output (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc-output "/share")) - (symlink (string-append docs "/share/gnome") - (string-append doc-output "/share/gnome")) - #t))) - (add-after - 'install-docs 'wrap-programs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each (lambda (prog) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/" prog) - `("PERL5LIB" ":" prefix - ,(map (lambda (o) - (string-append o "/lib/perl5/site_perl/" - ,(package-version perl))) - (if (string=? prog "gnc-fq-helper") - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (inputs))) - '("perl-finance-quote" - "perl-date-manip")))) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (inputs))) - '("perl-finance-quote"))))))))) - '("gnucash" - "gnc-fq-check" - "gnc-fq-helper" - "gnc-fq-dump")))) + (add-after 'install 'install-docs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((docs (assoc-ref inputs "gnucash-docs")) + (doc-output (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc-output "/share")) + (symlink (string-append docs "/share/gnome") + (string-append doc-output "/share/gnome")) + #t))) + (add-after 'install-docs 'wrap-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each (lambda (prog) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/" prog) + `("PERL5LIB" ":" prefix + ,(map (lambda (o) + (string-append o "/lib/perl5/site_perl/" + ,(package-version perl))) + (if (string=? prog "gnc-fq-helper") + (list + ,@(transitive-input-references + 'inputs + (map (lambda (l) + (assoc l (inputs))) + '("perl-finance-quote" + "perl-date-manip")))) + (list + ,@(transitive-input-references + 'inputs + (map (lambda (l) + (assoc l (inputs))) + '("perl-finance-quote"))))))))) + '("gnucash" + "gnc-fq-check" + "gnc-fq-helper" + "gnc-fq-dump")))) (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 -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnucash-Convert-price-quotes-perl-patch-to-a-pha.patch >From 7bc2ef10c8be601eeed1800739a6c3f06617f02a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 18:07:16 -0500 Subject: [PATCH 2/5] gnu: gnucash: Convert price-quotes-perl patch to a phase. * gnu/packages/patches/gnucash-price-quotes-perl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gnucash.scm (gnucash)[patches]: Remove it. [phases]{fix-finance-quote-check}: Implement it using SUBSTITUTES*. --- gnu/local.mk | 1 - gnu/packages/gnucash.scm | 10 ++++++-- .../patches/gnucash-price-quotes-perl.patch | 24 ------------------- 3 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/gnucash-price-quotes-perl.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d4159e16..958e2cc96 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -774,7 +774,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ - %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index e85a538c4..015e2b045 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -60,8 +60,7 @@ (sha256 (base32 "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) - (patches (search-patches "gnucash-price-quotes-perl.patch" - "gnucash-disable-failing-tests.patch" + (patches (search-patches "gnucash-disable-failing-tests.patch" "gnucash-fix-test-transaction-failure.patch")))) (build-system cmake-build-system) (inputs @@ -119,6 +118,13 @@ (("set\\(SHELL /bin/bash\\)") (string-append "set(SHELL " (which "bash") ")"))) #t))) + ;; 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* "libgnucash/scm/price-quotes.scm" + (("\"perl\" \"-w\" ") "")) + #t)) ;; There are about 100 megabytes of documentation. (add-after 'install 'install-docs (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/patches/gnucash-price-quotes-perl.patch b/gnu/packages/patches/gnucash-price-quotes-perl.patch deleted file mode 100644 index 3101ddb00..000000000 --- a/gnu/packages/patches/gnucash-price-quotes-perl.patch +++ /dev/null @@ -1,24 +0,0 @@ -After wrapping gnc-fq-check and gnc-fq-helper we can no longer execute them -with perl, so execute them directly instead. - -diff -ur gnucash-3.2.old/libgnucash/scm/price-quotes.scm gnucash-3.2/libgnucash/scm/price-quotes.scm ---- gnucash-3.2.old/libgnucash/scm/price-quotes.scm 2018-09-15 00:48:33.718389646 -0400 -+++ gnucash-3.2/libgnucash/scm/price-quotes.scm 2018-09-15 13:51:49.249862724 -0400 -@@ -74,7 +74,7 @@ - (define (start-program) - (if (not (string-null? gnc:*finance-quote-check*)) - (set! program (gnc-spawn-process-async -- (list "perl" "-w" gnc:*finance-quote-check*) #t)))) -+ (list gnc:*finance-quote-check*) #t)))) - - (define (get-sources) - (if (not (null? program)) -@@ -158,7 +158,7 @@ - (define (start-quoter) - (if (not (string-null? gnc:*finance-quote-helper*)) - (set! quoter (gnc-spawn-process-async -- (list "perl" "-w" gnc:*finance-quote-helper*) #t)))) -+ (list gnc:*finance-quote-helper*) #t)))) - - (define (get-quotes) - (if (not (null? quoter)) -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnucash-Disable-the-stress-options-test-using-a-.patch >From 2d798ba770aff3d2c88b4eceed621be7d25f6e5d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 18:28:56 -0500 Subject: [PATCH 3/5] gnu: gnucash: Disable the stress-options-test using a phase. The qof test is also reinstated; it was failing because the needed locales were not installed. * gnu/packages/patches/gnucash-disable-failing-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gnucash.scm (gnucash)[patches]: Remove it. [phases]{disable-stress-options-test}: Implement it using SUBSTITUTES*. {install-locales}: New phase. --- gnu/local.mk | 1 - gnu/packages/gnucash.scm | 18 ++++++++- .../gnucash-disable-failing-tests.patch | 39 ------------------- 3 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/gnucash-disable-failing-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 958e2cc96..622266ee2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -774,7 +774,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ - %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 015e2b045..58b46243a 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -60,8 +60,7 @@ (sha256 (base32 "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) - (patches (search-patches "gnucash-disable-failing-tests.patch" - "gnucash-fix-test-transaction-failure.patch")))) + (patches (search-patches "gnucash-fix-test-transaction-failure.patch")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -125,6 +124,21 @@ (substitute* "libgnucash/scm/price-quotes.scm" (("\"perl\" \"-w\" ") "")) #t)) + ;; The test-stress-options unit test is known to fail, so we disable + ;; it (see: https://bugs.gnucash.org/show_bug.cgi?id=796877). + (add-after 'unpack 'disable-stress-options-test + (lambda _ + (substitute* "gnucash/report/standard-reports/test/CMakeLists.txt" + (("test-stress-options.scm") "")) + #t)) + ;; The qof test requires the en_US, en_GB, and fr_FR locales. + (add-before 'check 'install-locales + (lambda _ + (setenv "LOCPATH" (getcwd)) + (invoke "localedef" "-i" "en_US" "-f" "UTF-8" "./en_US.UTF-8") + (invoke "localedef" "-i" "en_GB" "-f" "UTF-8" "./en_GB.UTF-8") + (invoke "localedef" "-i" "fr_FR" "-f" "UTF-8" "./fr_FR.UTF-8") + #t)) ;; There are about 100 megabytes of documentation. (add-after 'install 'install-docs (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/patches/gnucash-disable-failing-tests.patch b/gnu/packages/patches/gnucash-disable-failing-tests.patch deleted file mode 100644 index e0fdd86b5..000000000 --- a/gnu/packages/patches/gnucash-disable-failing-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -test-stress-options.scm does not exist, and test-qof passes when run in the -build directory after the gnucash build. - -diff -ur gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt ---- gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:29:00.916641417 -0400 -+++ gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:30:52.962504860 -0400 -@@ -13,10 +13,6 @@ - test-income-gst.scm - ) - --set(scm_test_with_textual_ports_SOURCES -- test-stress-options.scm --) -- - set(GUILE_DEPENDS - scm-gnc-module - scm-app-utils -@@ -31,9 +27,6 @@ - - if (HAVE_SRFI64) - gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}") -- if (HAVE_TEXT_PORTS) -- gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}") -- endif (HAVE_TEXT_PORTS) - endif (HAVE_SRFI64) - - gnc_add_scheme_tests("${scm_test_standard_reports_SOURCES}") -diff -ur gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt gnucash-3.3/libgnucash/engine/test/CMakeLists.txt ---- gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt 2018-10-04 09:29:00.876640751 -0400 -+++ gnucash-3.3/libgnucash/engine/test/CMakeLists.txt 2018-10-05 10:46:22.542962546 -0400 -@@ -54,8 +54,6 @@ - # This test does not run on Win32 - if (NOT WIN32) - set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) -- add_engine_test(test-qof "${SOURCES}") -- target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof) - - set(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) - add_engine_test(test-engine "${SOURCES}") -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gnucash-Update-to-3.4.patch >From ffddd751ffed28523a2cfaadc200b9f90330fdfe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 18:26:43 -0500 Subject: [PATCH 4/5] gnu: gnucash: Update to 3.4. * gnu/packages/gnucash.scm (gnucash): Update to 3.4. [outputs]: Add debug. (gnucash-docs): Update to 3.4-1. [native-inputs]: Update docbook-xml to version 4.5 and drop older versions. --- gnu/packages/gnucash.scm | 69 +++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 58b46243a..057ca709d 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -49,9 +49,11 @@ #:use-module (gnu packages xml)) (define-public gnucash + ;; TODO: Unbundle libraries such as guile-json found under the "borrowed/" + ;; directory. (package (name "gnucash") - (version "3.3") + (version "3.4") (source (origin (method url-fetch) @@ -59,7 +61,7 @@ version "/gnucash-" version ".tar.bz2")) (sha256 (base32 - "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) + "1ms2wg4sh5gq3rpjmmnp85rh5nc9ahca1imxkvhz4d3yiwy8hm52")) (patches (search-patches "gnucash-fix-test-transaction-failure.patch")))) (build-system cmake-build-system) (inputs @@ -83,7 +85,7 @@ ("googletest" ,googletest) ("gnucash-docs" ,gnucash-docs) ("pkg-config" ,pkg-config))) - (outputs '("out" "doc")) + (outputs '("out" "doc" "debug")) (arguments `(#:test-target "check" #:configure-flags @@ -192,38 +194,41 @@ financial calculations or scheduled transactions.") ;; This package is not public, since we use it to build the "doc" output of ;; the gnucash package (see above). It would be confusing if it were public. (define gnucash-docs - (package - (name "gnucash-docs") - (version (package-version gnucash)) - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" - version "/gnucash-docs-" version ".tar.gz")) - (sha256 - (base32 - "10v4hw4lh888r8yv473pqrvzfjg8dwamk62sghs93rn88ndwm16c")))) - (build-system gnu-build-system) - ;; These are native-inputs because they are only required for building the - ;; documentation. - (native-inputs - `(("libxml2" ,libxml2) - ;; The "check" target needs the docbook xml packages for validating the - ;; DocBook XML during the tests. - ("docbook-xml-4.4" ,docbook-xml-4.4) - ("docbook-xml-4.2" ,docbook-xml-4.2) - ("docbook-xml-4.1.2" ,docbook-xml-4.1.2) - ("libxslt" ,libxslt) - ("docbook-xsl" ,docbook-xsl) - ("scrollkeeper" ,scrollkeeper))) - (home-page "https://www.gnucash.org/") - (synopsis "Documentation for GnuCash") - (description - "User guide and other documentation for GnuCash in various languages. + (let ((revision "1")) ;set to the empty string when no revision + (package + (name "gnucash-docs") + (version (package-version gnucash)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" + version "/gnucash-docs-" version + (if (string-null? revision) + "" + (string-append "-" revision)) + ".tar.gz")) + (sha256 + (base32 + "0bgjxpxgk7hy8ihn1kvd8p6vv191q5md2hz6jb9mqc4aykpvdlq7")))) + (build-system gnu-build-system) + ;; These are native-inputs because they are only required for building the + ;; documentation. + (native-inputs + `(("libxml2" ,libxml2) + ;; The "check" target needs the docbook xml package for validating the + ;; DocBook XML during the tests. + ("docbook-xml" ,docbook-xml) + ("libxslt" ,libxslt) + ("docbook-xsl" ,docbook-xsl) + ("scrollkeeper" ,scrollkeeper))) + (home-page "https://www.gnucash.org/") + (synopsis "Documentation for GnuCash") + (description + "User guide and other documentation for GnuCash in various languages. This package exists because the GnuCash project maintains its documentation in an entirely separate package from the actual GnuCash program. It is intended to be read using the GNOME Yelp program.") - (license (list license:fdl1.1+ license:gpl3+)))) + (license (list license:fdl1.1+ license:gpl3+))))) (define-public gwenhywfar (package -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-gnucash-Add-information-about-how-to-use-the-doc.patch >From e65ecdc8e0f1ebd9c05ed9f06d623947cac5f9d9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 4 Jan 2019 23:11:15 -0500 Subject: [PATCH 5/5] gnu: gnucash: Add information about how to use the documentation. It was not obvious that another application, Yelp, needed to be installed to so that opening the help of GnuCash from within the application would work. Fixes issue #33960 (see: https://issues.guix.info/issue/33960). * gnu/packages/gnucash.scm (gnucash)[description]: Explain how to enable the documentation. --- gnu/packages/gnucash.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 057ca709d..b22045eb8 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -188,7 +188,10 @@ It can be used to track bank accounts, stocks, income and expenses, based on the double-entry accounting practice. It includes support for QIF/OFX/HBCI import and transaction matching. It also automates several tasks, such as -financial calculations or scheduled transactions.") +financial calculations or scheduled transactions. + +To make the GnuCash documentation available, its doc output must be +installed as well as Yelp, the Gnome help browser.") (license license:gpl3+))) ;; This package is not public, since we use it to build the "doc" output of -- 2.20.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 21 16:49:56 2019 Received: (at 33985) by debbugs.gnu.org; 21 Jan 2019 21:49:56 +0000 Received: from localhost ([127.0.0.1]:40609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glhS8-00035f-C9 for submit@debbugs.gnu.org; Mon, 21 Jan 2019 16:49:56 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:33014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glhS5-00035V-Dh for 33985@debbugs.gnu.org; Mon, 21 Jan 2019 16:49:55 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CE1FF4485; Mon, 21 Jan 2019 22:49:51 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aeQpVDB5ozyo; Mon, 21 Jan 2019 22:49:51 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 074E8447F; Mon, 21 Jan 2019 22:49:50 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: [bug#33985] [PATCH] Update GnuCash to v3.4 and other improvements References: <87pntbpvmm.fsf@apteryx.i-did-not-set--mail-host-address--so-tickle-me> Date: Mon, 21 Jan 2019 22:49:50 +0100 In-Reply-To: <87pntbpvmm.fsf@apteryx.i-did-not-set--mail-host-address--so-tickle-me> (Maxim Cournoyer's message of "Fri, 04 Jan 2019 23:37:53 -0500") Message-ID: <877eexisu9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 33985 Cc: 33985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Maxim, Maxim Cournoyer skribis: > This patch series improve our GnuCash package so that it relies less on > patches (which are harder to maintain), updates it to the latest 3.4 > version, as well as clarify how the documentation output can be used. All five patches LGTM, thank you! Ludo=E2=80=99. PS: To all the committers reading this: please consider reviewing your fellow hacker patches! :-) From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 23 07:53:31 2019 Received: (at 33985-done) by debbugs.gnu.org; 23 Jan 2019 12:53:31 +0000 Received: from localhost ([127.0.0.1]:42107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gmI27-0007UW-C3 for submit@debbugs.gnu.org; Wed, 23 Jan 2019 07:53:31 -0500 Received: from mail-io1-f68.google.com ([209.85.166.68]:39228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gmI24-0007UI-Sj for 33985-done@debbugs.gnu.org; Wed, 23 Jan 2019 07:53:29 -0500 Received: by mail-io1-f68.google.com with SMTP id k7so1564656iob.6 for <33985-done@debbugs.gnu.org>; Wed, 23 Jan 2019 04:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=cTvyXHoZZNNv1fkc2Bt4ioty0QjJh+f/DoknV4/JIr4=; b=h7/8X35JMkt5gzHJdcUFI+zXHUj9siPCrl4XhrZVaz/9NL0tNVD/ibM+9FCiD6G+Ke 3bL4NOlwQQ358+Xv1+Cndt3869VRcsO7E5XoS24H2/Vql+z5jg2mR6+E9d8x6pVxYW8r aRn1CSr+grulCKFhSExMzn3a4ZpEgE8vfykRrfj82/31ag1LzEECvqlNDBqG9WHJv0xl UtFmOuuyGJ12w8YHsb3oPumZqzrOyIUfMXK24L8F4dgV/EaPriEUWVmilomkT1/HvSms zaEfIDg8QsjL9Ezh6bhenSMgJ8XLK0NKM6fAv/OqtVU16kL1qZeWaPtYegHXGKca5Hmc vIKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=cTvyXHoZZNNv1fkc2Bt4ioty0QjJh+f/DoknV4/JIr4=; b=mUfRWmJ7SVxJo650gc6KFDMeyrgtOhbpEVZnFJHDgdh9XkWQxIFvW4Y+/Drsroo+jT lnRawiwwYj2G60CyKe/AZIV2DLLNftfVyrc6ry2Nr8g8FZI+1yuafGjHnEqI8fJ1/Gef +P2/hrvaU9vZb/oyjcAuCHB4f6HzqgIMj4qxHEgSmIO2Ao2g/XlIZc3HjG1pM7/Ofa19 awCmHz5Cio7eUU1hEEs5GSBAlIsghN9TyMXSB/0vI53S3/wHFznicsjXRIVw3fqRHSGE KpWcOR1X615nPaXMEvgW9c7zPNe0PT0/Uh1UKfJI/NVF5FGtndr2vurlUCmRnvf3fV5p jjtw== X-Gm-Message-State: AHQUAub+k9cLpN8H6ZVgvwFiu+tMJ7YrY/2WchVNbvf1btcRvr2faFlJ JXRynCM9Etj0lZCdazPdvY59cSMI X-Google-Smtp-Source: AHgI3IZj7XKRVLsNA/X6JeBcBoP1l9PvzsBdab+yZ7BczDz5c7oAFhZCa/wciu46z657fMpFNYbL4w== X-Received: by 2002:a6b:6111:: with SMTP id v17mr1198285iob.107.1548248002852; Wed, 23 Jan 2019 04:53:22 -0800 (PST) Received: from kwak ([157.52.5.144]) by smtp.gmail.com with ESMTPSA id l18sm9133858itb.32.2019.01.23.04.53.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jan 2019 04:53:22 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#33985] [PATCH] Update GnuCash to v3.4 and other improvements References: <87pntbpvmm.fsf@apteryx.i-did-not-set--mail-host-address--so-tickle-me> <877eexisu9.fsf@gnu.org> Date: Wed, 23 Jan 2019 07:53:17 -0500 In-Reply-To: <877eexisu9.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 21 Jan 2019 22:49:50 +0100") Message-ID: <8736pjeds2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 33985-done Cc: 33985-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello! Ludovic Court=C3=A8s writes: > Hi Maxim, > > Maxim Cournoyer skribis: > >> This patch series improve our GnuCash package so that it relies less on >> patches (which are harder to maintain), updates it to the latest 3.4 >> version, as well as clarify how the documentation output can be used. > > All five patches LGTM, thank you! Pushed to master, thanks for the review! > Ludo=E2=80=99. > > PS: To all the committers reading this: please consider reviewing your > fellow hacker patches! :-) I hear you! :-) Have a nice day, Maxim From unknown Fri Sep 05 20:56:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 21 Feb 2019 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator