From patchwork Sun Jan 5 16:13:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 19593 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0E480179F0; Sun, 5 Jan 2020 16:14:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C098E179EE for ; Sun, 5 Jan 2020 16:14:10 +0000 (GMT) Received: from localhost ([::1]:43226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8Xa-0004BW-BW for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 11:14:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56059) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8XT-0004AB-IO for guix-patches@gnu.org; Sun, 05 Jan 2020 11:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io8XS-0002xT-7j for guix-patches@gnu.org; Sun, 05 Jan 2020 11:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38546) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io8XS-0002xO-4b for guix-patches@gnu.org; Sun, 05 Jan 2020 11:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io8XS-0001AO-11 for guix-patches@gnu.org; Sun, 05 Jan 2020 11:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38947] [PATCH 1/3] gnu: Add opensp. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 16:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38947@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15782408334459 (code B ref -1); Sun, 05 Jan 2020 16:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2020 16:13:53 +0000 Received: from localhost ([127.0.0.1]:44519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8XI-00019r-Mc for submit@debbugs.gnu.org; Sun, 05 Jan 2020 11:13:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:52468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8XH-00019j-IG for submit@debbugs.gnu.org; Sun, 05 Jan 2020 11:13:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55987) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8XG-00049m-04 for guix-patches@gnu.org; Sun, 05 Jan 2020 11:13:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io8XE-0002io-Cp for guix-patches@gnu.org; Sun, 05 Jan 2020 11:13:49 -0500 Received: from mout01.posteo.de ([185.67.36.65]:36710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1io8XD-0002hn-PT for guix-patches@gnu.org; Sun, 05 Jan 2020 11:13:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 54E1916005F for ; Sun, 5 Jan 2020 17:13:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1578240825; bh=EkVhVUCjESLQxVXJZRFDcA8mzQ/2sxPjQ8GWdSYOK4s=; h=From:To:Cc:Subject:Date:From; b=DDEHWv813l4+z/65LM620NFQow7HHBsToCu7aiKagP7mQvb7/HMROCp5sJnP/nn7m +ZbXXUGfx2eD7QpjJoFtBVnbeyHpi2MLPao369JhTZ6XGAtFmcRBy8620M8Tj9u+Lz lpKsUa1G8Faa5U9jepOSbMcqfsa5lQKIB361Wo77ak9KiKxIi3l/GVRPaOEOurEMv8 AqpX+Cxxzl6WV8gToFD2Q1GJ2MpFE9EEuVqxhOKhMrPuOsCJ9FpDFutlcVAcOkPH09 pDjne6ZtnhvX0TYO8ZtqzQwTYBNRIy6p1v4vFTYaQwY/2l5MCfYlUaXwzdFcmpahqR e36w07VFLxPXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47rNx40RqFz6tm5; Sun, 5 Jan 2020 17:13:43 +0100 (CET) From: Kei Kebreau Date: Sun, 5 Jan 2020 11:13:29 -0500 Message-Id: <20200105161329.1455-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/finance.scm (opensp): New variable. --- gnu/packages/finance.scm | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ce3033c054..b66d8b89a1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -51,10 +51,12 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages dns) #:use-module (gnu packages emacs) #:use-module (gnu packages dbm) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) @@ -1218,3 +1220,53 @@ offers confimations after less than 5 seconds and have significantly lower fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin Cash protocol. This package provides the Bitcoin Cash command line client and a client based on Qt. This is a fork of Bitcoin Core."))) + +(define-public opensp + (package + (name "opensp") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/opensp/" + version "/OpenSP-" version ".tar.gz")) + (sha256 + (base32 + "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto))) + (arguments + `(;; TODO: Fix and enable tests. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook")) + (xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (substitute* (find-files "docsrc" "\\.xml$") + (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + ;; Directly pass the path to the stylesheet to xmlto. + (substitute* "docsrc/Makefile.in" + (("\\$\\(XMLTO\\)") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl"))) + #t)))))) + (home-page "http://openjade.sourceforge.net/") + (synopsis "Suite of SGML/XML processing tools") + (description "OpenSP is an object-oriented toolkit for SGML parsing and +entity management.") + (license + ;; expat license with added clause regarding advertising + (license:non-copyleft + "file://COPYING" + "See COPYING in the distribution.")))) From patchwork Sun Jan 5 16:17:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 19594 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A79F6179F0; Sun, 5 Jan 2020 16:18:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 642C4179EE for ; Sun, 5 Jan 2020 16:18:11 +0000 (GMT) Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8bS-0005qa-Uk for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 11:18:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56737) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8bL-0005pA-EF for guix-patches@gnu.org; Sun, 05 Jan 2020 11:18:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io8bK-0005T2-4n for guix-patches@gnu.org; Sun, 05 Jan 2020 11:18:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io8bK-0005Sr-1i for guix-patches@gnu.org; Sun, 05 Jan 2020 11:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io8bJ-0001HY-Tm for guix-patches@gnu.org; Sun, 05 Jan 2020 11:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38947] [PATCH 2/3] gnu: Add libofx. References: <20200105161329.1455-1-kkebreau@posteo.net> In-Reply-To: <20200105161329.1455-1-kkebreau@posteo.net> Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 16:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38947@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 38947-submit@debbugs.gnu.org id=B38947.15782410774916 (code B ref 38947); Sun, 05 Jan 2020 16:18:01 +0000 Received: (at 38947) by debbugs.gnu.org; 5 Jan 2020 16:17:57 +0000 Received: from localhost ([127.0.0.1]:44524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8bF-0001HD-9d for submit@debbugs.gnu.org; Sun, 05 Jan 2020 11:17:57 -0500 Received: from mout01.posteo.de ([185.67.36.65]:41968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8bD-0001Gw-Mx for 38947@debbugs.gnu.org; Sun, 05 Jan 2020 11:17:56 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 35637160081 for <38947@debbugs.gnu.org>; Sun, 5 Jan 2020 17:17:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1578241068; bh=i3KMFLr07Ow3F11wvt05HRKeX+kU6vz9vPi9c1yMhs8=; h=From:To:Cc:Subject:Date:From; b=J/53/WwdlGyHrjZ2VhgBzgNFFvhsQjm7ibSFRMuCwi7R49jznXvvAMWPhGGDTjKg4 ZAGr9DxvEYJuXiV0c61YNRDNeDJMdkIpeuAIsAP3N1uQZskYAQ1iXRspiwNRAhiw51 /WfYE4Ctp7fMCXfO2JeTPc04D6t4zn9F5Y1YTkbnBSnxd2VHucrbHPxCgcBMEfBSEA JsqLDfOLfttpnn9BmjwQZxKV48fcKvJYT+jsOyfQdfJiSHtyZGxaP7hYALAyrWPqGV 0NNO75rjjujgYXnhegnplYFGQX0OywfmaMQG88VWqG03YuCOrxRZS3xiUfFzNKjj2G 43dyHo4WqhZXg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47rP1M1bfMz6tmG; Sun, 5 Jan 2020 17:17:27 +0100 (CET) From: Kei Kebreau Date: Sun, 5 Jan 2020 11:17:05 -0500 Message-Id: <20200105161706.1841-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/finance.scm (libofx): New variable. --- gnu/packages/finance.scm | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b66d8b89a1..5881f375ca 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -68,9 +69,11 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -1221,6 +1224,49 @@ fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin Cash protocol. This package provides the Bitcoin Cash command line client and a client based on Qt. This is a fork of Bitcoin Core."))) +(define-public libofx + (package + (name "libofx") + (version "0.9.15") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libofx/libofx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list (string-append "--with-opensp-includes=" + (assoc-ref %build-inputs "opensp") + "/include/OpenSP")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gengetopt" ,gengetopt) + ("help2man" ,help2man) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("libxml++-2" ,libxml++-2) + ("opensp" ,opensp))) + (home-page "http://libofx.sourceforge.net/") + (synopsis "Library supporting the Open Financial Exchange format") + (description + "The LibOFX library is a API designed to allow applications to very easily +support OFX command responses, usually provided by financial institutions. The +following three utilities are included with the library: +@enumerate +@item @code{ofxdump} +@item @code{ofx2qif} +@item @code{ofxconnect} +@end enumerate") + (license license:gpl2+))) + (define-public opensp (package (name "opensp") From patchwork Sun Jan 5 16:18:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 19595 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 658A2179EF; Sun, 5 Jan 2020 16:19:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 04651179EF for ; Sun, 5 Jan 2020 16:19:15 +0000 (GMT) Received: from localhost ([::1]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8cU-00064d-IW for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 11:19:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56852) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io8cN-000646-I4 for guix-patches@gnu.org; Sun, 05 Jan 2020 11:19:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io8cI-00066G-KP for guix-patches@gnu.org; Sun, 05 Jan 2020 11:19:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io8cI-000666-DR for guix-patches@gnu.org; Sun, 05 Jan 2020 11:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io8cI-0001JT-A5 for guix-patches@gnu.org; Sun, 05 Jan 2020 11:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38947] [PATCH 3/3] gnu: gnucash: Update to 3.8b. References: <20200105161329.1455-1-kkebreau@posteo.net> In-Reply-To: <20200105161329.1455-1-kkebreau@posteo.net> Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 16:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38947@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 38947-submit@debbugs.gnu.org id=B38947.15782410994984 (code B ref 38947); Sun, 05 Jan 2020 16:19:02 +0000 Received: (at 38947) by debbugs.gnu.org; 5 Jan 2020 16:18:19 +0000 Received: from localhost ([127.0.0.1]:44528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8ba-0001IK-Jp for submit@debbugs.gnu.org; Sun, 05 Jan 2020 11:18:19 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io8bY-0001I1-A1 for 38947@debbugs.gnu.org; Sun, 05 Jan 2020 11:18:17 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8ADD3160061 for <38947@debbugs.gnu.org>; Sun, 5 Jan 2020 17:18:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1578241090; bh=Br+26aRYrfIj3WCPaR6WzOkIEwC4vLDt9MKwnQoqu/Q=; h=From:To:Cc:Subject:Date:From; b=NXp651OvuwWKss8WtXdCf5KXrEIDzJsTBzJWHDMXO7NbUv6dI7fbFktpo00DzkoT3 68fwK68qdsAJ6goPI1WHRUG2/erXFHB7QdYLfqfW2yTBX5u1mL3P7hfUJRL7+3aq31 0MpML/VOBKQw7sS8Nj1tqHV2aqEdyzkRlo7+JKk39aE7TiI7/NaffQBsxhn5x6+bG+ OPsUub0/56W/lPZ03Z/pJlJwa+XCJkwvuisbTfA53AtQZpsJorGkE4eXMO/1/9kX5t SeKAYQ2Opr6Y+HnN4pf+w4ONRVWeO4s+jskwP1xe9tpdhCgU3QlngOuWcMLlHhB5w6 fI0kA/Sa+lKgA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47rP292BdJz6tmG; Sun, 5 Jan 2020 17:18:09 +0100 (CET) From: Kei Kebreau Date: Sun, 5 Jan 2020 11:18:06 -0500 Message-Id: <20200105161806.1982-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnucash.scm (gnucash): Update to 3.8b. [arguments]: Remove '-DWITH_OFX=OFF' configure flag to enable libofx support. [inputs]: Add libofx. [propagated-inputs]: Add dconf. (gnucash-docs): Update to 3.8. --- gnu/packages/gnucash.scm | 268 ++++++++++++++++++++------------------- 1 file changed, 136 insertions(+), 132 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index af017e108d..9a26ef45ac 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages finance) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages glib) @@ -54,136 +55,139 @@ (define-public gnucash ;; TODO: Unbundle libraries such as guile-json found under the "borrowed/" ;; directory. - (package - (name "gnucash") - (version "3.7") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" - version "/gnucash-" version ".tar.bz2")) - (sha256 - (base32 - "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb")))) - (build-system cmake-build-system) - (inputs - `(("guile" ,guile-2.2) - ("boost" ,boost) - ("icu4c" ,icu4c) - ("glib" ,glib) - ("gtk" ,gtk+) - ("libdbi" ,libdbi) - ("libdbi-drivers" ,libdbi-drivers) - ("libgnomecanvas" ,libgnomecanvas) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("webkitgtk" ,webkitgtk) - ("aqbanking" ,aqbanking) - ("perl-date-manip" ,perl-date-manip) - ("perl-finance-quote" ,perl-finance-quote) - ("tzdata" ,tzdata-for-tests))) - (native-inputs - `(("glib" ,glib "bin") ; glib-compile-schemas, etc. - ("intltool" ,intltool) - ("googlemock" ,(package-source googletest)) - ("googletest" ,googletest) - ("gnucash-docs" ,gnucash-docs) - ("pkg-config" ,pkg-config))) - (outputs '("out" "doc" "debug")) - (arguments - `(#:test-target "check" - #:configure-flags - (list "-DWITH_OFX=OFF") ; libofx is not available yet - #:make-flags '("GUILE_AUTO_COMPILE=0") - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build cmake-build-system) - (guix build glib-or-gtk-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-gmock - (lambda* (#:key inputs #:allow-other-keys) - (mkdir "gmock") - (copy-recursively (assoc-ref inputs "googlemock") "gmock") - (setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock")) - #t)) - (add-after 'unpack 'set-env-vars - (lambda* (#:key inputs #:allow-other-keys) - (let ((tzdata (assoc-ref inputs "tzdata"))) - ;; At least one test is time-related and requires this - ;; environment variable. - (setenv "TZDIR" - (string-append tzdata - "/share/zoneinfo")) - (substitute* "CMakeLists.txt" - (("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)) - ;; 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) - (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) - `("GNC_DBD_DIR" = - (,(string-append - (assoc-ref inputs "libdbi-drivers") - "/lib/dbd"))) - `("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 (package-inputs this-package))) - '("perl-finance-quote" - "perl-date-manip")))) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (package-inputs this-package))) - '("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 - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (home-page "https://www.gnucash.org/") - (synopsis "Personal and small business financial accounting software") - (description - "GnuCash is personal and professional financial-accounting software. + (let ((revision "b")) + (package + (name "gnucash") + (version "3.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" + version "/gnucash-" version revision ".tar.bz2")) + (sha256 + (base32 + "0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg")))) + (build-system cmake-build-system) + (inputs + `(("guile" ,guile-2.2) + ("boost" ,boost) + ("icu4c" ,icu4c) + ("glib" ,glib) + ("gtk" ,gtk+) + ("libdbi" ,libdbi) + ("libdbi-drivers" ,libdbi-drivers) + ("libgnomecanvas" ,libgnomecanvas) + ("libofx" ,libofx) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("webkitgtk" ,webkitgtk) + ("aqbanking" ,aqbanking) + ("perl-date-manip" ,perl-date-manip) + ("perl-finance-quote" ,perl-finance-quote) + ("tzdata" ,tzdata-for-tests))) + (native-inputs + `(("glib" ,glib "bin") ; glib-compile-schemas, etc. + ("intltool" ,intltool) + ("googlemock" ,(package-source googletest)) + ("googletest" ,googletest) + ("gnucash-docs" ,gnucash-docs) + ("pkg-config" ,pkg-config))) + (propagated-inputs + ;; dconf is required at runtime according to README.dependencies. + `(("dconf" ,dconf))) + (outputs '("out" "doc" "debug")) + (arguments + `(#:test-target "check" + #:make-flags '("GUILE_AUTO_COMPILE=0") + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build glib-or-gtk-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-gmock + (lambda* (#:key inputs #:allow-other-keys) + (mkdir "gmock") + (copy-recursively (assoc-ref inputs "googlemock") "gmock") + (setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock")) + #t)) + (add-after 'unpack 'set-env-vars + (lambda* (#:key inputs #:allow-other-keys) + (let ((tzdata (assoc-ref inputs "tzdata"))) + ;; At least one test is time-related and requires this + ;; environment variable. + (setenv "TZDIR" + (string-append tzdata + "/share/zoneinfo")) + (substitute* "CMakeLists.txt" + (("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)) + ;; 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) + (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) + `("GNC_DBD_DIR" = + (,(string-append + (assoc-ref inputs "libdbi-drivers") + "/lib/dbd"))) + `("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 (package-inputs this-package))) + '("perl-finance-quote" + "perl-date-manip")))) + (list + ,@(transitive-input-references + 'inputs + (map (lambda (l) + (assoc l (package-inputs this-package))) + '("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 + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (home-page "https://www.gnucash.org/") + (synopsis "Personal and small business financial accounting software") + (description + "GnuCash is personal and professional financial-accounting software. 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 @@ -191,7 +195,7 @@ 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+))) + (license license:gpl3+)))) ;; 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. @@ -207,7 +211,7 @@ installed as well as Yelp, the Gnome help browser.") version "/gnucash-docs-" version revision ".tar.gz")) (sha256 (base32 - "1h4hm58ikffbhplx4gm8pzm9blfwqa1sz8yc2fqi21vs5v0ijf9r")))) + "19v6kchda724xkkgwlw5rg21jcpirhch12j9sr6ibnv61sd4ql52")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation.