From patchwork Fri Apr 14 15:59: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: 49156 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 CBC1B17570; Fri, 14 Apr 2023 17:02:56 +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 E01A917544 for ; Fri, 14 Apr 2023 17:02:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnLqK-0008S1-G8; Fri, 14 Apr 2023 12:00:08 -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 1pnLqG-0008R5-BL for guix-patches@gnu.org; Fri, 14 Apr 2023 12:00:04 -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 1pnLqF-0006UV-Ey for guix-patches@gnu.org; Fri, 14 Apr 2023 12:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnLqF-00087C-Aq for guix-patches@gnu.org; Fri, 14 Apr 2023 12:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62514] [PATCH v2] 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: Fri, 14 Apr 2023 16:00:03 +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: moreinfo patch To: 62514@debbugs.gnu.org Cc: Andy Tai Received: via spool by 62514-submit@debbugs.gnu.org id=B62514.168148798131103 (code B ref 62514); Fri, 14 Apr 2023 16:00:03 +0000 Received: (at 62514) by debbugs.gnu.org; 14 Apr 2023 15:59:41 +0000 Received: from localhost ([127.0.0.1]:47367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnLpt-00085Z-Ei for submit@debbugs.gnu.org; Fri, 14 Apr 2023 11:59:41 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:46745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnLps-00085N-2c for 62514@debbugs.gnu.org; Fri, 14 Apr 2023 11:59:40 -0400 Received: by mail-pj1-f45.google.com with SMTP id mq14-20020a17090b380e00b002472a2d9d6aso4421174pjb.5 for <62514@debbugs.gnu.org>; Fri, 14 Apr 2023 08:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681487974; x=1684079974; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=0yZ6bUrxWiWVuLMmp4HJmGMWavz34kE5Hj2W3RTaXco=; b=MWFlXPNarwxehTpWR+/kCtUOTHYr9d0Jo0P7GFi+0juoCaqYvJrWSG5MvBVgrOdJU4 UVc96xH9srVDNiP/BBaAsIhATdbl9QZNkPNqOa5lvZJdlLgm7osbfbtmKRiU/V6Uf9Gp tjQlkg76QusgnmYTyxtYsGhs04gUlIgFPMx8ewSREbjDm2dtJ/zhihR4fEZ6YT0oJ13Q VL5kR9pS8HmMlKn09SSqc/28qI5xvnc1zuF0C+emXSyFVfCfNXPKvZ6GTwYHIBlOM/L7 uqDxnT1a6dh4bWdRPQoV4KdOKLyzuc8FweoogY6p8jdFhm7zbVsUvF7fDmff61uy9OA8 gXdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487974; x=1684079974; 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=0yZ6bUrxWiWVuLMmp4HJmGMWavz34kE5Hj2W3RTaXco=; b=bYnA7C78Pk8PS7vrEKKtFSoMoxCJ8+cz7PveanjVsCxsOXlY63FXgP4CNyqDTyDbKv o1okjxXqK0Es/XKplqczRTIXDAAZdRsz0aQApVCmWj443XglwUNUbCSdMUjmWB5fchtu DXowzlWvpEuTCncfzcsyeByiqmd3BJK7dktAlqoNINN4/swjmAJOux6P8f4BtV0d9UFq slBufXp90GuKGc5b14SU8dqTB0ImEWo3u596SEdAjtdQ6pd6SBG3ouktEFGnFYt6/Xur sbFcanhmVUdIrGpWob9XhDl+SOebpx1Bxx6SZIHlQ7NErYVaTtKWAJt9SPLrOkganilP G9mQ== X-Gm-Message-State: AAQBX9ftAw95r3eJ7ZL4UdbluAX/GB3+7fjC7BWjDuxYen1gjJpWnVu8 UEYWjqh2lC/wFwPI4nAXZ+I+LH8iCFQ= X-Google-Smtp-Source: AKy350Yeywz11qLZty354JlykaZVtQ67kbfDCGMGDBF+CtHIpZogwuBlNyAVZiMu8OM9PVHbPlPeiw== X-Received: by 2002:a05:6a20:b725:b0:ea:eb3f:4c54 with SMTP id fg37-20020a056a20b72500b000eaeb3f4c54mr5873207pzb.27.1681487973630; Fri, 14 Apr 2023 08:59:33 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id f1-20020a631001000000b0050fa6546a45sm2927751pgl.6.2023.04.14.08.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:59:33 -0700 (PDT) From: Andy Tai Date: Fri, 14 Apr 2023 08:59:29 -0700 Message-Id: <20230414155929.14547-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 [source]: Patch out unsupported tests [arguments]: 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 | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) base-commit: fcb9ba2e71ed1e7af1f1c3ee51da639ba9483ec3 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/")