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: Liliana Marie Prikler X-Patchwork-Id: 50049 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 2AF1327BBEA; Tue, 16 May 2023 17:47:54 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,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 0C7AA27BBE9 for ; Tue, 16 May 2023 17:47:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyxpX-0002iO-RY; Tue, 16 May 2023 12:47:19 -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 1pyxpG-0002hr-Du for guix-patches@gnu.org; Tue, 16 May 2023 12:47: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 1pyxpG-00071j-6A for guix-patches@gnu.org; Tue, 16 May 2023 12:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyxpG-0006s8-1a for guix-patches@gnu.org; Tue, 16 May 2023 12:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v4 2/4] 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 16:47: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: ludo@gnu.org, Juliana Sims Received: via spool by 62635-submit@debbugs.gnu.org id=B62635.168425560526369 (code B ref 62635); Tue, 16 May 2023 16:47:02 +0000 Received: (at 62635) by debbugs.gnu.org; 16 May 2023 16:46:45 +0000 Received: from localhost ([127.0.0.1]:47183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxoz-0006r9-95 for submit@debbugs.gnu.org; Tue, 16 May 2023 12:46:45 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:52659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxow-0006qm-RR for 62635@debbugs.gnu.org; Tue, 16 May 2023 12:46:44 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-50bc456cc39so21102560a12.1 for <62635@debbugs.gnu.org>; Tue, 16 May 2023 09:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684255597; x=1686847597; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=ZR77QBCDb+MjmN5GTy/5iKf3bwP6GZouk3p9tClGf6M=; b=Qdo9+c+wrCLqY2FzGKYSUY99alNE0wExCwQcNSm1oQanvO7z8xAkoCr9Q5yuH3VP6c qA9eYXPNDN3s5LjdkZ5GSMO1A4Q6KerUYTyokdqwESnJp9pVguC3y+O3iOOQ9dvL3AF4 7tleu4bBnxXsUFpqxsC+w2IDVBGzOES2gnBTjF3uaC87D5drKPitepQ5NFOSxbOSL/Rm 5q/ffQlghDM+JcN5kdUYP85Ln0jvL5/VSs4HOfIsMsNvtEOU657YDuijZdktS045rZhW rvWYpKXB3kfieo+FO1iVNytm0EGBHGb78zlWwHNynFuJYvprbD1p0jN3hrceFIvw74LT GVeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684255597; x=1686847597; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZR77QBCDb+MjmN5GTy/5iKf3bwP6GZouk3p9tClGf6M=; b=EbSWK7I/I9x1ZTG4ULdxq5BDDw39kO9CeHcrlZ4tU4k8OE8g6+k1pghErbtxcftaiA 5TcAGschAhzvTvpIeIfJYyGkDSA4/WbUmhQhIiSwowVEY+GO4uiSevrgClvr3RZOLtfx r4dcwUBJ5Qm/gCAmWrnmjrhULCNjYhHwEnN2TOJ/iiwxd9h5FIHI8HLQueoP2Acj6ZPo aPkAZ/uFifmZk/Brp5cMAfvPQO5Woaee4b7lPdWOXrSpDyVgTNq7fwkZMPt3+CIQ/6zC OLM5kczbjmyCB7Q/TJKuptfWafIL9rE7bsP1eRwgC8Y9jZdNUKSV0WdcPiIa1EUL9lQ8 +o/g== X-Gm-Message-State: AC+VfDxF/8vDkZzC+fnSmGk1m++UPBUfMqykU//bczk8Iggm/VIrd9mG rZDZJfAqqOtAxLN44vTfQS0foPUd1dUD0A== X-Google-Smtp-Source: ACHHUZ4+hYkZ7fgazxgCDxRQ9D+jGRQmZ0xnWklerw2AlPusRUJ+9u1Jl51/YebFAd/o65n9pOWyYQ== X-Received: by 2002:a17:907:2d11:b0:96a:411a:1cc4 with SMTP id gs17-20020a1709072d1100b0096a411a1cc4mr21702163ejc.66.1684255596918; Tue, 16 May 2023 09:46:36 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s16-20020a170906285000b0096b15e4ffcesm3815040ejc.85.2023.05.16.09.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 09:46:36 -0700 (PDT) From: Juliana Sims X-Google-Original-From: Juliana Sims Message-Id: In-Reply-To: References: Date: Tue, 16 May 2023 01:12:59 -0400 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]: Convert to list of G-Expressions. Signed-off-by: Liliana Marie Prikler --- 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