From patchwork Tue Apr 18 05:17:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 49279 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 A929F17996; Tue, 18 Apr 2023 06:18:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 9E86E17994 for ; Tue, 18 Apr 2023 06:18:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1podjK-0002xa-K5; Tue, 18 Apr 2023 01:18:17 -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 1podjB-0002vb-OS for guix-patches@gnu.org; Tue, 18 Apr 2023 01:18:06 -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 1podj8-0003vW-Mn for guix-patches@gnu.org; Tue, 18 Apr 2023 01:18:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1podj8-0004l0-50 for guix-patches@gnu.org; Tue, 18 Apr 2023 01:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62514] [PATCH v3] gnu: gnucash: Update to 5.0 References: <20230329064901.13800-1-atai@atai.org> In-Reply-To: <20230329064901.13800-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Apr 2023 05:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62514 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62514@debbugs.gnu.org Cc: Andy Tai Received: via spool by 62514-submit@debbugs.gnu.org id=B62514.168179506418263 (code B ref 62514); Tue, 18 Apr 2023 05:18:02 +0000 Received: (at 62514) by debbugs.gnu.org; 18 Apr 2023 05:17:44 +0000 Received: from localhost ([127.0.0.1]:57439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1podiq-0004kV-6r for submit@debbugs.gnu.org; Tue, 18 Apr 2023 01:17:44 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:45281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1podio-0004kH-GG for 62514@debbugs.gnu.org; Tue, 18 Apr 2023 01:17:43 -0400 Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-63b7096e2e4so1224499b3a.2 for <62514@debbugs.gnu.org>; Mon, 17 Apr 2023 22:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681795056; x=1684387056; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=kVAx4smyGEZ9MbaQhbf5brY9/vNCFUbfkrSTTRexyVw=; b=Ce4TWFILVoCRm+4GCYd4a8iFqhITgh+GwJryifDY8Zl6c8QX1KWnGFZXk/Y6UM5+Tc 3YQmFzLzjnq1Wgf0RbSA4gruOUIGR7tZXqoZSBApnX3O7Wrs1ftHZlYX45QJKLjmwrwL uIH5TbD8L1Jccl41oWdfkDIvV+8nLf66AosCVCGg1rm9yx97DudxllfsfAnL4v9CNaF7 vJ4/ZHCI58Q0/KVS64GiSE+pM9DvQxQ9x+Prcurmzq7L+QvIBITp4oOLnbNWUy+5eLLh g526Lp8Nehv2oivZw6OOV2wG10+HRWgbVRfe6pwzNSuCoWy3526Vy6tWe2dEU6Z64FRV AWIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681795056; x=1684387056; 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=kVAx4smyGEZ9MbaQhbf5brY9/vNCFUbfkrSTTRexyVw=; b=Ndopy3qiIg8oqfrY9O+R93hA3SRe1aVqyyzVs19D0yuroPQScPxHaaQ/pbmfMUmWke dEeF4mKw2Hg1Ya9KTNeKiB2etcg1hHzR+FGtkn6MaR8koVF71CpNYIyeQ4VGxHbMg0Lo +3hVMDAE3MoWnAa/+OlJHrWoFVkKyewcr6WLa3Mv7Bax4hY/ogilL30Og+bxRvh372h/ INkyVfIDm7SdEiljPGIp2pEHnbz+zDVbmu2GsVWSYbeDR4HTGq4pByjVyf8xyUd13vv8 An1UwQZ7FOobBWr5aeAu5mJ1HrkWqKuAcQAutHd1fymgq3mI2NL4Xk1ziqYM861hT5Bp 0eog== X-Gm-Message-State: AAQBX9d3r1Dfy4ZlTTt7H2Ufob3DJQ5RvkhDAZ4X4HWtXa15dE7LDXiy 9RsPok9xsEgGjSL+f/wlyOx0V38M59o= X-Google-Smtp-Source: AKy350YhqnsSBZkbsOO0K8I3WeE82x1kJqONJEd2u5nxoOHIQYE9HeBHVZ14GujqlsKRu6TzhKOF9Q== X-Received: by 2002:a17:902:c94f:b0:1a6:dc4a:b8fa with SMTP id i15-20020a170902c94f00b001a6dc4ab8famr1109489pla.54.1681795056003; Mon, 17 Apr 2023 22:17:36 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id z5-20020a1709027e8500b001a6527f6ad7sm8534334pla.85.2023.04.17.22.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 22:17:35 -0700 (PDT) From: Andy Tai Date: Mon, 17 Apr 2023 22:17:29 -0700 Message-Id: <20230418051729.12375-1-atai@atai.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 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 [arguments]: Patch out unsupported tests. Remove references in patching code to removed source files upstream * gnu/packages/gnucash.scm (gnucash-doc): Update to 5.0 [native-inputs]: Add texinfo per upstream build doc --- gnu/packages/gnucash.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) base-commit: 9a5e1dc1f16f5f8c056e64f2077b035784003673 prerequisite-patch-id: 2fe043491619f0182074f836ad7b0c91f725637e diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 0386910ce6..6fe63f487e 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -47,6 +47,7 @@ (define-module (gnu packages gnucash) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages swig) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages webkit) @@ -64,14 +65,14 @@ (define-public gnucash ;; directory. (package (name "gnucash") - (version "4.11") + (version "5.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-" version ".tar.bz2")) (sha256 - (base32 "069b216dkpjs9hp32s4bhi6f76lbc81qvbmjmz0dxq3v1piys57q")))) + (base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg")))) (outputs '("out" "doc" "debug" "python")) (build-system cmake-build-system) (arguments @@ -87,6 +88,13 @@ (define-public gnucash (guix build utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-unsupported-test + ;; test test-gnc-quotes neeeds perl JSON::Parse + ;; not packaged in Guix yet + (lambda _ + (substitute* "libgnucash/app-utils/test/CMakeLists.txt" + (("gnc_add_test\\(test-gnc-quotes") + "#gnc_add_test\\(test-gnc-quotes")))) (add-after 'unpack 'set-env-vars (lambda* (#:key inputs #:allow-other-keys) ;; At least one test is time-related and requires this @@ -95,12 +103,6 @@ (define-public gnucash (substitute* "CMakeLists.txt" (("set\\(SHELL /bin/bash\\)") (string-append "set(SHELL " (which "bash") ")"))))) - ;; After wrapping gnc-fq-check and gnc-fq-helper we can no longer - ;; execute them with perl, so execute them directly instead. - (add-after 'unpack 'fix-finance-quote-check - (lambda _ - (substitute* "gnucash/price-quotes.scm" - (("\"perl\" \"-w\" ") "")))) ;; The qof test requires the en_US, en_GB, and fr_FR locales. (add-before 'check 'install-locales (lambda _ @@ -155,9 +157,7 @@ (define-public gnucash (assoc l (package-inputs this-package))) '("perl-finance-quote"))))))))) '("gnucash" - "gnc-fq-check" - "gnc-fq-helper" - "gnc-fq-dump")))) + "gnc-fq-update")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap @@ -217,7 +217,7 @@ (define gnucash-docs "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-docs-" version revision ".tar.gz")) (sha256 - (base32 "162qq8p76grczdnsd4qbpxn1d8ap6l2n1a00a601v5hij7rqwfx8")))) + (base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882")))) (build-system cmake-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. @@ -226,9 +226,11 @@ (define gnucash-docs ;; XML during the tests. (list docbook-xml docbook-xsl + libsecret libxml2 libxslt - scrollkeeper)) + scrollkeeper + texinfo)) (arguments `(#:tests? #f)) ;no test target (home-page "https://www.gnucash.org/")