From patchwork Tue May 16 05:12:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 13039 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 13AE827BBEA; Tue, 16 May 2023 06:14:37 +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=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 433BE27BBE2 for ; Tue, 16 May 2023 06:14:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyn0e-0001MT-Jb; Tue, 16 May 2023 01:14:04 -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 1pyn0d-0001JV-0E for guix-patches@gnu.org; Tue, 16 May 2023 01:14: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 1pyn0c-0006cA-Nr for guix-patches@gnu.org; Tue, 16 May 2023 01:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyn0c-00040W-Iz for guix-patches@gnu.org; Tue, 16 May 2023 01:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v3 2/3] gnu: geary: Use g-expressions. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 05:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62635@debbugs.gnu.org Cc: Juliana Sims Received: via spool by 62635-submit@debbugs.gnu.org id=B62635.168421401715353 (code B ref 62635); Tue, 16 May 2023 05:14:02 +0000 Received: (at 62635) by debbugs.gnu.org; 16 May 2023 05:13:37 +0000 Received: from localhost ([127.0.0.1]:44910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyn0D-0003zY-9g for submit@debbugs.gnu.org; Tue, 16 May 2023 01:13:37 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:56295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyn0A-0003yz-Dw for 62635@debbugs.gnu.org; Tue, 16 May 2023 01:13:34 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id 609A01BF206; Tue, 16 May 2023 05:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1684214008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BXlo1oNUH9+lxFvv7BawGb0FAKdRjwNez8F0LkUZIuk=; b=hk0ftCilOUDGDZZoJYvE3awXioIbQd5MxE8jGB8gWoFUOQRg9up7WdYaUAEZPHYUmCejc2 4SEdMMoOrOo7qrGlDh4LlQdve863wNC+GSjtkkKZhQI9BMerpoayrpKvija+VA20x+Rimb EcL8xCcHXc16bUjIAYCqST+eyaEX8av4QVK8Ezut3Ex8I6gAJBK7ErXHgHgp/i1kYFS2ke ErzQUHorJvyBXdlvVy1/tuKlKj5hoNevDQmQsxefC/wkv21S/IeetRfP0YyZLGA0rTNydX xwHGVTUMU8SOBhNfB2ieXAo2gRNJC9cAGmworpMVBybr9Sl/5h1+BB7A9qGYWA== From: Juliana Sims Date: Tue, 16 May 2023 01:12:59 -0400 Message-Id: <9a74909d4f018363a134dc9bf6ebcf92605f884f.1684213970.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/gnome.scm (geary) [arguments]: Use g-expressions. --- gnu/packages/gnome.scm | 69 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2ba299d308..bb3266b05a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12318,41 +12318,40 @@ (define-public geary "04hvw86r8sczvjm1z3ls5y5y5h6nyfb648rjkfx05ib00mqq5v1x")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:configure-flags - '("-Dprofile=release") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test-client.vala" - (("client.add_suite\\(new Application.CertificateManagerTest\\(\\).suite\\);") - "")) - (substitute* "test/test-engine.vala" - (("engine.add_suite\\(new Geary.RFC822.MessageDataTest\\(\\).suite\\);") - "")))) - (add-after 'unpack 'generate-vapis - (lambda* (#:key inputs #:allow-other-keys) - ;; It’s not possible to generate the GMime vapi, because - ;; there’s custom metadata that gmime didn’t - ;; install. Thus, the vapi should be built and installed - ;; with gmime. - (define gmime - (assoc-ref inputs "gmime")) - (copy-file (string-append gmime "/share/vala/vapi/gmime-3.0.vapi") - "bindings/vapi/gmime-3.0.vapi"))) - (add-after 'unpack 'disable-postinstall-script - (lambda _ - (substitute* "build-aux/post_install.py" - (("gtk-update-icon-cache") - "true")))) - (add-before 'check 'setup-home - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd)))) - (add-before 'check 'setup-xvfb - (lambda _ - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))))) + (list #:glib-or-gtk? #t + #:configure-flags + #~(list "-Dprofile=release") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "test/test-client.vala" + (("client.add_suite\\(new Application.CertificateManagerTest\\(\\).suite\\);") + "")) + (substitute* "test/test-engine.vala" + (("engine.add_suite\\(new Geary.RFC822.MessageDataTest\\(\\).suite\\);") + "")))) + (add-after 'unpack 'generate-vapis + (lambda _ + ;; It’s not possible to generate the GMime vapi, because + ;; there’s custom metadata that gmime didn’t + ;; install. Thus, the vapi should be built and installed + ;; with gmime. + (copy-file #$(file-append gmime "/share/vala/vapi/gmime-3.0.vapi") + "bindings/vapi/gmime-3.0.vapi"))) + (add-after 'unpack 'disable-postinstall-script + (lambda _ + (substitute* "build-aux/post_install.py" + (("gtk-update-icon-cache") + "true")))) + (add-before 'check 'setup-home + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd)))) + (add-before 'check 'setup-xvfb + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) (inputs (list enchant folks-with-libsoup2