From patchwork Wed Mar 29 06:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 48783 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 EC59817152; Wed, 29 Mar 2023 07:50:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A080A17147 for ; Wed, 29 Mar 2023 07:50:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phPdF-0004B0-Kh; Wed, 29 Mar 2023 02:50:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phPdD-0004Ai-Ge for guix-patches@gnu.org; Wed, 29 Mar 2023 02:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phPdD-0003yw-62 for guix-patches@gnu.org; Wed, 29 Mar 2023 02:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phPdC-0001Kx-Ec for guix-patches@gnu.org; Wed, 29 Mar 2023 02:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62514] [PATCH] gnu: gnucash: Update to 5.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Mar 2023 06:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62514 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62514@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16800725575074 (code B ref -1); Wed, 29 Mar 2023 06:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Mar 2023 06:49:17 +0000 Received: from localhost ([127.0.0.1]:51146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phPcT-0001Jl-6s for submit@debbugs.gnu.org; Wed, 29 Mar 2023 02:49:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:36274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phPcR-0001Jc-7z for submit@debbugs.gnu.org; Wed, 29 Mar 2023 02:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phPcN-00046x-Jh for guix-patches@gnu.org; Wed, 29 Mar 2023 02:49:12 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phPcL-0003vR-Fy for guix-patches@gnu.org; Wed, 29 Mar 2023 02:49:11 -0400 Received: by mail-pj1-x1031.google.com with SMTP id a16so13174385pjs.4 for ; Tue, 28 Mar 2023 23:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680072546; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=iKxpu8duRaKWx3c+Q4W/QSjb32jXDaSw1u8mjKqFhrE=; b=c67BywZOq6hFfDRaWMzQ8nOL2XnYkJ0/Hkk5ivzL5Z6wiuOOZ6vPuXKKbZZltPGzM4 YY9nAp5rzn9ZDwa9FU5UqPHpjL34tG8WVADGXDNY7xIcwanff86Ll1Vzh+ZPUJnnE4z3 71Z/JJ0yn6sgTqGZqShEMYFYfMz8XYOBY0zwXT0/ZrBtHnsEPMLn8lnYc910vbzE3WQc bh/aju0eIrCqSkoyjdznyqlaF0XjpNpcpRliWUkg3nvzZwFZQwQtyqYMX+floxwNK4eE xlyG5NxRGeHxDlyP9BF4QN4uG9W+YvJv5da2aN4+4NgYG0xaZh7uH/o57h7d7uI4MMUa DvLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680072546; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iKxpu8duRaKWx3c+Q4W/QSjb32jXDaSw1u8mjKqFhrE=; b=dJq5hvWouZBijHwCTW8fF6UpBJ1GrGDPJHHFEIol3T+Nd/UerSG5/nFPL56wzaFmby MrDV4VFocAYHrdtt/ib2uWknIbaSuN6oMudn4m26Hoo9JaK3uLcShulliURI6DQfzJdi rfg+7a9TV3IJIXn9REZtxLHjU6eTqNE6fMuOxR8ut2OUyBV9JCy283DDZE7eCar1HSUb 8GyLa2S17bbLy9oKlwu7CDVx3SF+iWGbxeQPpmqKcArv2I3JaKsh6uPOFxJqmzZXeD3l t9+rHBdDnWd4M7r8DQSYlsKhdGwFFUEW69bmZbQQXccxIKTQz39t5vTIHkefEY1QiqR9 gHUA== X-Gm-Message-State: AAQBX9cBvkQON3NZzZDLZTci1Fu18IiNmEDEdUREC/P10dM+7ZOKdp0I zsBrUR+empMU8czLMjlpb3cWrc0J1D4= X-Google-Smtp-Source: AKy350a20RtqiYcAkqdNOjS8xv9nhSQv6QqCUHVmqSth6Rtl0ugdNQTfhEqsMFwU8S3PYhmjDjNj2g== X-Received: by 2002:a17:90b:3b4d:b0:240:3dc7:4939 with SMTP id ot13-20020a17090b3b4d00b002403dc74939mr22304331pjb.27.1680072545679; Tue, 28 Mar 2023 23:49:05 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id mh11-20020a17090b4acb00b0023cfbe7d62esm4377073pjb.1.2023.03.28.23.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 23:49:05 -0700 (PDT) From: Andy Tai Date: Tue, 28 Mar 2023 23:49:01 -0700 Message-Id: <20230329064901.13800-1-atai@atai.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=lichengtai@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnucash.scm (gnucash): Update to 5.0 --- gnu/packages/gnucash.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) base-commit: c9af27d4ca733b20f09019f1465d3e5fdc1ec724 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/")