From patchwork Tue Apr 18 05:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 49281 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 ACEAD17997; Tue, 18 Apr 2023 06:47:22 +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 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 53C5D17993 for ; Tue, 18 Apr 2023 06:47:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poeBF-0007EV-7y; Tue, 18 Apr 2023 01:47: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 1poeBC-0007EE-M3 for guix-patches@gnu.org; Tue, 18 Apr 2023 01:47:02 -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 1poeBC-0000yV-Bp for guix-patches@gnu.org; Tue, 18 Apr 2023 01:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poeBC-0005Z9-04 for guix-patches@gnu.org; Tue, 18 Apr 2023 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62514] [PATCH v5] 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:47:01 +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.168179677621340 (code B ref 62514); Tue, 18 Apr 2023 05:47:01 +0000 Received: (at 62514) by debbugs.gnu.org; 18 Apr 2023 05:46:16 +0000 Received: from localhost ([127.0.0.1]:57514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poeAS-0005Y8-8X for submit@debbugs.gnu.org; Tue, 18 Apr 2023 01:46:16 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:46288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poeAR-0005Xv-4a for 62514@debbugs.gnu.org; Tue, 18 Apr 2023 01:46:15 -0400 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1a66911f5faso12634155ad.0 for <62514@debbugs.gnu.org>; Mon, 17 Apr 2023 22:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681796769; x=1684388769; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=RVBWhyd5Tf/rPxgPYKqk8teiU7B/dnvh6gHOL83UQxQ=; b=RS7zhJmb+zx3fyY2CbFpO8BQBdtBMTi4Jg+wBg0W6u+anI2x1W2BhvjgnbXOxjYmtD cAHJefV2VQSZqASueV1h4Tm5xLUwc4M297UoVv1BE1qXin9z4/5/RymC+jJSLIc3caWt EXWp3kcZvifVHAjKm7g50cpiUxfzd5LAUzu3uDlrNq7tfEpqk+2uhJWBQC47MNREoCLR eSSHBR4btyncoI3PXlJUFngpO3uZASIHt/O9LmHKTf2/WNNiKFnfRTYgHHXh6feiAffU aJdEyvAIUHswstakuDnlLbv4zMAsRM1fVpLCU+WBwHyXK6I9wIGlOb7UTwJiNJhZQCET x2aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681796769; x=1684388769; 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=RVBWhyd5Tf/rPxgPYKqk8teiU7B/dnvh6gHOL83UQxQ=; b=krPst8o/nFLoga+ckqMxugM52J2e9GcIxZu6rSXqW0h6i2dmHrDJOfJPXPkO5tvKzf Zi1yaGOVYYberF20EnHXbTA0b65ONfv+jgTBETJw5Q0ZeUjg204+ixbWi6odCFfWGgKU y0WTwpCjreWrU1cwi0apc3z2iIzEdPiaIy2AAYEJeQHA1R8jpv5feooH5xiRNo5cK5Oi up/bVGSMK6/dBsas9A534qSpPzX6LR7pEeenMr5arMjGj8AQDdc5GqNYu4NrtUrNfuDE LBZ6cROKp1CY3wvthC3aYdd/RIWjK7okNV/4eIzczuGXPhJSF8H83OghpKblb390NQw7 RXjQ== X-Gm-Message-State: AAQBX9d3vgEU2tF1mjjtw5Cu9GMRN/Spm4cDgqjPIbSGQVTExwtcjvs6 8Ao1V/DJv7eRA1LBHErZuanRRz5v1kY= X-Google-Smtp-Source: AKy350YgAroSSoL9JMGIqBHA3kWvgGQCCyEo+hVGF/NviYQC2NzzDoOV3mBbPKe2dvphEvIHvyfmtg== X-Received: by 2002:a17:903:40ca:b0:1a2:9e64:bc5e with SMTP id t10-20020a17090340ca00b001a29e64bc5emr874741pld.39.1681796768719; Mon, 17 Apr 2023 22:46:08 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id i13-20020a17090a2acd00b0023fcece8067sm7783199pjg.2.2023.04.17.22.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 22:46:08 -0700 (PDT) From: Andy Tai Date: Mon, 17 Apr 2023 22:46:04 -0700 Message-Id: <20230418054604.30042-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 --- gnu/packages/gnucash.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) base-commit: 9a5e1dc1f16f5f8c056e64f2077b035784003673 prerequisite-patch-id: 2fe043491619f0182074f836ad7b0c91f725637e diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 0386910ce6..ddc78a655e 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -64,14 +64,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 +87,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 +102,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 +156,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 +216,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.