From patchwork Mon Apr 3 02:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "J. Sims" X-Patchwork-Id: 48956 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 079CF172B8; Mon, 3 Apr 2023 03:02:15 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,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 A14FD16FD0 for ; Mon, 3 Apr 2023 03:02:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj9WI-0005Qc-Dw; Sun, 02 Apr 2023 22:02:06 -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 1pj9WE-0005QN-RA for guix-patches@gnu.org; Sun, 02 Apr 2023 22:02:05 -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 1pj9WE-0005TS-Ir for guix-patches@gnu.org; Sun, 02 Apr 2023 22:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj9WE-0003Ef-Ep for guix-patches@gnu.org; Sun, 02 Apr 2023 22:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH 2/2] gnu: geary: Use g-expressions. References: <9uT-ndM-7Ha4KhKGJfuVdxauTOVx993n3g2pOtQdAPYEaMdytH_QMe-5yw1mc3f3QDraZKqVwUadOYVIFJjIEk9aRvuMDVwmv3VyYiPCUKE=@protonmail.com> In-Reply-To: <9uT-ndM-7Ha4KhKGJfuVdxauTOVx993n3g2pOtQdAPYEaMdytH_QMe-5yw1mc3f3QDraZKqVwUadOYVIFJjIEk9aRvuMDVwmv3VyYiPCUKE=@protonmail.com> Resent-From: "J. Sims" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Apr 2023 02:02: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" <62635@debbugs.gnu.org> Received: via spool by 62635-submit@debbugs.gnu.org id=B62635.168048728612393 (code B ref 62635); Mon, 03 Apr 2023 02:02:02 +0000 Received: (at 62635) by debbugs.gnu.org; 3 Apr 2023 02:01:26 +0000 Received: from localhost ([127.0.0.1]:43018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj9Vd-0003Dp-Tv for submit@debbugs.gnu.org; Sun, 02 Apr 2023 22:01:26 -0400 Received: from mail-4318.protonmail.ch ([185.70.43.18]:23243) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj9Va-0003DZ-MT for 62635@debbugs.gnu.org; Sun, 02 Apr 2023 22:01:23 -0400 Date: Mon, 03 Apr 2023 02:01:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680487276; x=1680746476; bh=6i8DDn09JVOh6hChLx56hlkSikd30SButpFrInrArQM=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Y9XdAnlBh2aPAmWBLdx0jgZxYUcsSkX3pNx2fkhpAs/ShjRmTpbgYsIjvyHruDuim alZv0PIxpIMtPZs4dRiKkjnjtDk7Dc0U9t+SiqBBy5h3NaObRry1GvoZpN10+2xgQR 0iCxOCnjcSkhyqAGyis/QR8oHyVMOPKZC6XnoblQHdpNwHdO+ezJKrhEhVYNqzoiwV ZWcRMZAlWHKBoqG3yChz+xYmADw/rRcK26L8eb9sJZGdpAvwhownOu8ziCungKH8/J th0kR3qYvehKsSgutKZG9Nyc7wXpYnq2vDjABc2j5NVwjHsVDeFOXiflUbHD+ZicUk mrr0pgjgqckHw== Message-ID: Feedback-ID: 12133992:user:proton 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: , Reply-to: "J. Sims" X-ACL-Warn: , "J. Sims via Guix-patches" X-Patchwork-Original-From: "J. Sims via Guix-patches" via From: "J. Sims" 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 Empty Message From 4b10d7f81c379f47ba9c83b62d59d5c3727b2df1 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Sun, 2 Apr 2023 21:51:31 -0400 Subject: [PATCH 2/2] gnu: geary: Use g-expressions. * gnu/packages/gnome.scm (geary): Use g-expressions. --- gnu/packages/gnome.scm | 143 ++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 73 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 515a242ed0..acdfbb7d59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12604,79 +12604,76 @@ (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\\);") - "")))) - (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")))))) - (inputs - (list enchant - evolution-data-server - folks-with-libsoup2 - gcr - glib - gmime - gnome-online-accounts-3.44 - gsettings-desktop-schemas - gspell - gsound - gtk+ - iso-codes - json-glib - libcanberra - libgee - libhandy - libpeas - libsecret - libstemmer - libunwind - sqlite - webkitgtk-with-libsoup2 - ytnef)) - (native-inputs - (list appstream-glib - cmake-minimal - desktop-file-utils - gettext-minimal - glib - `(,glib "bin") - gmime - gobject-introspection - gsettings-desktop-schemas - itstool - libarchive - libxml2 - pkg-config - python-minimal - vala - xorg-server-for-tests)) + (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\\);") + "")))) + (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 (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")))))) + (inputs (list enchant + evolution-data-server + folks-with-libsoup2 + gcr + glib + gmime + gnome-online-accounts-3.44 + gsettings-desktop-schemas + gspell + gsound + gtk+ + iso-codes + json-glib + libcanberra + libgee + libhandy + libpeas + libsecret + libstemmer + libunwind + sqlite + webkitgtk-with-libsoup2 + ytnef)) + (native-inputs (list appstream-glib + cmake-minimal + desktop-file-utils + gettext-minimal + glib + `(,glib "bin") + gmime + gobject-introspection + gsettings-desktop-schemas + itstool + libarchive + libxml2 + pkg-config + python-minimal + vala + xorg-server-for-tests)) (synopsis "GNOME email application built around conversations") (description "Geary collects related messages together into conversations, -- 2.39.2