From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id MDGgAzT3V2RgCgEASxT56A (envelope-from ) for ; Sun, 07 May 2023 21:08:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MKKiAzT3V2S2yQAAauVa8A (envelope-from ) for ; Sun, 07 May 2023 21:08:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AD39371C3 for ; Sun, 7 May 2023 21:08:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvjjp-0001We-Qi; Sun, 07 May 2023 15:08: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 1pvjjm-0001WQ-PE for guix-patches@gnu.org; Sun, 07 May 2023 15:08: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 1pvjjm-0007cu-Gt for guix-patches@gnu.org; Sun, 07 May 2023 15:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvjjm-0000wc-C2 for guix-patches@gnu.org; Sun, 07 May 2023 15:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v1 3/3] gnu: geary: Use g-expressions. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 19:08: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.16834864233557 (code B ref 62635); Sun, 07 May 2023 19:08:02 +0000 Received: (at 62635) by debbugs.gnu.org; 7 May 2023 19:07:03 +0000 Received: from localhost ([127.0.0.1]:38513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvjio-0000vI-Nq for submit@debbugs.gnu.org; Sun, 07 May 2023 15:07:03 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:46285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvjim-0000uP-Kk for 62635@debbugs.gnu.org; Sun, 07 May 2023 15:07:01 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id 4FACE60003; Sun, 7 May 2023 19:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683486415; 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=x+qhm5IfsRdG5jwuKfJ2KAYoQw+3kaWvvGGIFEqHXzs=; b=TBi12mmlsOxZB0h1bEN2+lcQPiGlnGk0IrHrJjELoY+5PoeFNdBN1z+nBeOHdRhFWqEse8 bkj8G7/yiMhzo1o7nLOO+X9rASIKIgIEn3U/E+N6Y8PL1vRDtWjmp7UdZH9F2g12oNDsbI /utkHnTQgBvwOG7bkCJcX/XF1DJ94dnKg1goSZ0hOIA59U53YmyZ+gLA6xvuR+h4g80V30 +i+IbMJ06QR6Dz4bNppD7dZjIiWcSXeXSo5bE1Bb7gAbU3FkMLPnAQzuMiWaHlt0TYeyQ5 UhH6qQx3tDVtFfgFBeeQx6iiZtCwUnRB3GwWm6wdqcsZ96eodoti/4LFizm6Hg== From: Juliana Sims Date: Sun, 7 May 2023 15:06:06 -0400 Message-Id: <3015763ed081ecd89e68784e0dd3bc4e92d3e75f.1683486235.git.juli@incana.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <6ad35adb328d9dd26c7c15478efebf0076c65fda.1683486235.git.juli@incana.org> References: <6ad35adb328d9dd26c7c15478efebf0076c65fda.1683486235.git.juli@incana.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683486515; a=rsa-sha256; cv=none; b=Dbat9L+BrvvDu43r1pJZPfbZMLeTH7+LHx71srMRoi3ZgBQEhwavBaVk+IU8DDpLlVSkqO 9w24KcjpnVnvoIQjhyLwVYARHVpbNI2JC1QSxxFMbc+IU0Zri0ZmO9vXjwA9CSeI74JpZH 6XdCfRWSgrHlx/xLCys+8bh9RBgfaXONNHB/TI2hUoFNB7C7+LY6Dkfxk460dryVfVmC8S 8couHXStpLQhjvlPDrYCxASleYMmA3XDtc3JO9dd1HyO+pI1YOhnE9HaoR/lzW8mkNwFnu lLEX2qZd6gdiOI2ZMuFMSMU5Mmwk4Go+0pQQyQOP/CoojJgbJe4CLGaUFmYguA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=incana.org header.s=gm1 header.b=TBi12mml; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683486515; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=x+qhm5IfsRdG5jwuKfJ2KAYoQw+3kaWvvGGIFEqHXzs=; b=gPuwCZeguoqrnWn2OMPzOa6G3Vnz/QBOO813nlWojDSqllb+IoJN66loisoil4FYKkbjCz 8ehQEgQF1spiO7nEPP1+awesjL22X/pQ1SVORWVHUPYNSkl7f2UxrSISL2JfdNMSuXJx2c 6jK+9LXp7OCq2upnPbY4FqtZqSXjmzXbk45svyXjS7siFIzE4UCb95t62MveDgyC2kMnP0 I+Xl/P//YVjVj+eHeNiYAZ1NGIPol+PHukmWT17w/Zd/lCmfmv6uQS1MJ9eKH/Q7q49q2x nRrdOThGyp2JknT2m+oEkcVJNp9fzMhoyf4DL6bxNsJ27TB6XxrHSzYTJZ/z6Q== X-Migadu-Spam-Score: 1.49 X-Spam-Score: 1.49 X-Migadu-Queue-Id: AD39371C3 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=incana.org header.s=gm1 header.b=TBi12mml; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: 3ADHJQK8K+ec * 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 c1b3514d13..57291791a6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12308,41 +12308,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 evolution-data-server -- 2.39.2