GNU logs - #33985, boring messages


Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#33985] [PATCH] Update GnuCash to v3.4 and other improvements
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 05 Jan 2019 04:39:01 +0000
Resent-Message-ID: <handler.33985.B.154666308629795 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 33985
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 33985 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches <guix-patches@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.154666308629795
          (code B ref -1); Sat, 05 Jan 2019 04:39:01 +0000
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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1gfdin-0007kU-5h
	for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1gfdil-0007kN-EV
 for submit <at> 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 <maxim.cournoyer@HIDDEN>)
 id 1gfdik-0001fe-Vj
 for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1gfdii-0004X6-Gq
 for guix-patches@HIDDEN; 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 <maxim.cournoyer@HIDDEN>) id 1gfdif-0001dY-Au
 for guix-patches@HIDDEN; 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 <maxim.cournoyer@HIDDEN>)
 id 1gfdie-0001cP-Uy
 for guix-patches@HIDDEN; Fri, 04 Jan 2019 23:37:57 -0500
Received: by mail-it1-x141.google.com with SMTP id g85so4346829ita.3
 for <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>
 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
 Fri, 04 Jan 2019 20:37:55 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-Google-Original-From: Maxim Cournoyer
 <maxim@HIDDEN>
Date: Fri, 04 Jan 2019 23:37:53 -0500
Message-ID: <87pntbpvmm.fsf@HIDDEN>
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-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <maxim.cournoyer@HIDDEN>
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 <maxim.cournoyer@HIDDEN>
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 <maxim.cournoyer@HIDDEN>
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 <maxim.cournoyer@HIDDEN>
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 <maxim.cournoyer@HIDDEN>
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


--=-=-=--




Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: bug#33985: Acknowledgement ([PATCH] Update GnuCash to v3.4 and
 other improvements)
Message-ID: <handler.33985.B.154666308629795.ack <at> debbugs.gnu.org>
References: <87pntbpvmm.fsf@HIDDEN>
X-Gnu-PR-Message: ack 33985
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 33985 <at> debbugs.gnu.org
Date: Sat, 05 Jan 2019 04:39:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 33985 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
33985: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D33985
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems



Last modified: Sat, 5 Jan 2019 04:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.