From patchwork Sun May 7 19:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 12862 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 6928827BBE2; Sun, 7 May 2023 20:07:30 +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 2D87827BBEA for ; Sun, 7 May 2023 20:07:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvjip-0001Eo-E4; Sun, 07 May 2023 15:07:03 -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 1pvjio-0001EY-4c for guix-patches@gnu.org; Sun, 07 May 2023 15:07: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 1pvjin-0007LA-Sc for guix-patches@gnu.org; Sun, 07 May 2023 15:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvjin-0000ut-IC for guix-patches@gnu.org; Sun, 07 May 2023 15:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v1 1/3] gnu: geary: Fix failing build. References: <9uT-ndM-7Ha4KhKGJfuVdxauTOVx993n3g2pOtQdAPYEaMdytH_QMe-5yw1mc3f3QDraZKqVwUadOYVIFJjIEk9aRvuMDVwmv3VyYiPCUKE=@protonmail.com> In-Reply-To: <9uT-ndM-7Ha4KhKGJfuVdxauTOVx993n3g2pOtQdAPYEaMdytH_QMe-5yw1mc3f3QDraZKqVwUadOYVIFJjIEk9aRvuMDVwmv3VyYiPCUKE=@protonmail.com> Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 19:07:01 +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.16834864133491 (code B ref 62635); Sun, 07 May 2023 19:07:01 +0000 Received: (at 62635) by debbugs.gnu.org; 7 May 2023 19:06:53 +0000 Received: from localhost ([127.0.0.1]:38505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvjie-0000uF-Ve for submit@debbugs.gnu.org; Sun, 07 May 2023 15:06:53 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:48115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvjic-0000u1-L7 for 62635@debbugs.gnu.org; Sun, 07 May 2023 15:06:51 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id 3D29060002; Sun, 7 May 2023 19:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683486405; 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; bh=2zNDiTnPOdxvQuPSL0PzEfnlGvUp9ZtooRojCPcdpmY=; b=P5vifakSiFOMwFshu4fjNhqrKipPKKAUWt8/HZjtc/bwycGfNOsNbl8Sh6hA9oxq0ckMLo WKexqZ9n+MmtPoGvicsjey7I4iaveKEwMpnHhovwdu19ZJdouGbkJH63xRYWLm1xI5e7lY Kc69RQNVpte/E+GKnwGuW0riEhBOev1JkbYxaK1KrBOXM3bS8YUkNDOEP9FzN2/3qhLzWI VkNPCxpbdKewd+CkIEUNcaUnR+eniTPlA48ggsuc6E5j92BEcvZp6Q8jbfC0f3rBkNSEls Vszu1/f63LnZzUjgm0itYzIbA+aLaLaQD5+M6nce29Hk6Zuz79Iap8PyLk8bNw== From: Juliana Sims Date: Sun, 7 May 2023 15:06:04 -0400 Message-Id: <6ad35adb328d9dd26c7c15478efebf0076c65fda.1683486235.git.juli@incana.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 Hello, This set of patches will fix Geary's build as well as apply the same changes mentioned previously. For whatever reason, I had deleted the original branch I made, so this is a clean patchset. Let me know if I need to make any changes :) Thanks, Juli * gnu/packages/gnome.scm (geary): Fix failing build. [arguments]: Disable failing test. [native-inputs]: Use older version of vala. --- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: d16826cc32ba821e17236dea0536da7200947c97 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b3c954d849..d0e4efc416 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -74,6 +74,7 @@ ;;; Copyright © 2022 Alexandros Theodotou ;;; Copyright © 2022 Arjan Adriaanse ;;; Copyright © 2023 Kaelyn Takata +;;; Copyright © 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -234,6 +235,7 @@ (define-module (gnu packages gnome) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix transformations) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (ice-9 match) @@ -12314,6 +12316,9 @@ (define-public geary (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) @@ -12376,7 +12381,7 @@ (define-public geary libxml2 pkg-config python-minimal - vala + vala-0.52 xorg-server-for-tests)) (synopsis "GNOME email application built around conversations") (description