From patchwork Tue May 16 05:12:58 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: 50048 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 B729D27BBE9; Tue, 16 May 2023 17:47:46 +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 2424C27BBEA for ; Tue, 16 May 2023 17:47:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyxpY-0002jO-A4; Tue, 16 May 2023 12:47:20 -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 1pyxpL-0002iF-Gs for guix-patches@gnu.org; Tue, 16 May 2023 12:47:08 -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 1pyxpH-000723-JV for guix-patches@gnu.org; Tue, 16 May 2023 12:47:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyxpH-0006sV-FH for guix-patches@gnu.org; Tue, 16 May 2023 12:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v4 1/4] gnu: geary: Fix build failure. 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: Tue, 16 May 2023 16:47:03 +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.168425560926398 (code B ref 62635); Tue, 16 May 2023 16:47:03 +0000 Received: (at 62635) by debbugs.gnu.org; 16 May 2023 16:46:49 +0000 Received: from localhost ([127.0.0.1]:47189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxp3-0006rc-Fr for submit@debbugs.gnu.org; Tue, 16 May 2023 12:46:49 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:44278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxow-0006qk-DR for 62635@debbugs.gnu.org; Tue, 16 May 2023 12:46:45 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-510b6a249a8so203688a12.0 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=1684255596; x=1686847596; h=mime-version:cc:to:subject:date:message-id:from:from:to:cc:subject :date:message-id:reply-to; bh=whk8ZYeWsc2mj5m5q62bZHujuBFpo3REAL8dlcPmQVg=; b=lWVy+b1+xI6KSpLJ4Vdk4q5ZTKLqQKwjbBPl2YrPe84DlCxXlDDlSJN8EBWTjeE/Va 8prDF8TvMR4DjrQV/xJqcI7IPOGUXkG/LHgAapzyJzkwjSCkNJpiRsTIyOyfEYM9moYm f1yMDxkr4DAEaKdl8uiMoqgo++5Y/irg9R8km+Ob6ilkhA0YvhZHadQVLP65kkwAKsYk dyrfdYWWwwBItJRz7P47v9ZN/OKy+MS8PGPuBdWtEgplz8zXQ1CJM+IFMVsvLrdtYaPA rDFb/d0mHx9CZWOc9hIsLoqoxMVjgnURkFnckzHvnAwA+Pc/0BtAjVX0nsQLHu8Hgeiy TWNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684255596; x=1686847596; h=mime-version:cc:to:subject:date:message-id:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=whk8ZYeWsc2mj5m5q62bZHujuBFpo3REAL8dlcPmQVg=; b=R4JU7LV2txHsfbvuwVN7bqsIjsaN2k1VfxiwKLVzbJPhfuNwifMi3CmzkqldSAw3nn PDMN/OU6V473Zlfu/Z6NImNnMrASwjvPamT0Xm++6QBidnKjFlym3gliBYbtFfomV5/X +nePWEGDjU1Mh8/YoZk5f9NeWWi+uaRw8VEZuLGZ/ZjCzJ6kAraRwhA/okH0UHoNJNhc Qi+uDMaVBIDKuRsnGjPl5UXi3PGyDu4nC2vJLE8s0QiImYPdVMAsSghhTFZgVWgg//fG vonb75oZa47SeQFM5a4TkruazEI2zuph698jJ3ZOkfNgTm8+5pL/ny+RdF66BNPaUnQF cYSw== X-Gm-Message-State: AC+VfDxFz8XdiG8VXHVkxF6nNPVCmMPO5dtISsl48a0tq5yZKekBbTMP 4dyGi28vcObdn2k9zXw0KbHfZzgqak5Ihw== X-Google-Smtp-Source: ACHHUZ555eSRt2cSk2uLgnsr/IypoWtvxWNZZT0jcZdQQWy9EbKBaU6WYuYQCMSr6MLIAhy7aosLNA== X-Received: by 2002:a17:907:9281:b0:960:ddba:e5c5 with SMTP id bw1-20020a170907928100b00960ddbae5c5mr40256824ejc.11.1684255596177; 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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 09:46:35 -0700 (PDT) From: Juliana Sims X-Google-Original-From: Juliana Sims Message-Id: Date: Tue, 16 May 2023 01:12:58 -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]: Disable failing test. [native-inputs]: Use vala-0.52 instead of vala. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: 242cc93438d67f5b35602d5add02e230850b0b43 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 754bb668ba..2ba299d308 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. ;;; @@ -12325,6 +12326,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) @@ -12387,7 +12391,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 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 From patchwork Tue May 16 05:13:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50047 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 AE29627BBEC; Tue, 16 May 2023 17:47:45 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 0DE7D27BBE9 for ; Tue, 16 May 2023 17:47:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyxpY-0002jM-35; Tue, 16 May 2023 12:47:20 -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 1pyxpL-0002iG-H8 for guix-patches@gnu.org; Tue, 16 May 2023 12:47:08 -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-00071t-Lr for guix-patches@gnu.org; Tue, 16 May 2023 12:47:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyxpG-0006sF-Hs for guix-patches@gnu.org; Tue, 16 May 2023 12:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v4 3/4] gnu: geary: Remove redundant native-inputs. 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.168425560926384 (code B ref 62635); Tue, 16 May 2023 16:47:02 +0000 Received: (at 62635) by debbugs.gnu.org; 16 May 2023 16:46:49 +0000 Received: from localhost ([127.0.0.1]:47185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxp2-0006rT-OE for submit@debbugs.gnu.org; Tue, 16 May 2023 12:46:48 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:49542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxox-0006qn-Fd for 62635@debbugs.gnu.org; Tue, 16 May 2023 12:46:45 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-96b0235c10bso626517866b.3 for <62635@debbugs.gnu.org>; Tue, 16 May 2023 09:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684255598; x=1686847598; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=b3L3jbtPzmAxSrBMjqzP8jpcnqPaz66WhSuiqbLF708=; b=O7wJI6BtiatpFuLbmDYZ17jpsyXNKlRxEw14EyVQH4j/MnC68PZfrzneqtY9e8b4K6 kX8M6+CFATYIZOnhRpbPBYjy1UooZeC6FL7NiGdsxNBtwcxZTpnUbPYN09Q+556xIoM4 3VtplHW8BCJO34jECZ4B5ZwycxS66SS6yIXeOEJMBJgpqKd3un46TeOQvs9hnYArDrc7 X9Eo5ebEpanZvTs7U0vGJwKdXX1eAz6IzzTBT9HLt9aBURnMloOagSXNmNqSjhFFZALX yF8oZFaI916YXg+EVgztIQFvF/QVL9ElsENBTqeUvOtmxEnP82m+PcHsivCb8C6iY/nf a+fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684255598; x=1686847598; 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=b3L3jbtPzmAxSrBMjqzP8jpcnqPaz66WhSuiqbLF708=; b=DZ3a7XU3dOWOsLjS7G9nLrbs1PY1T3RJhjEw5Vu3cHHgSRLNdjEZURUVRvRPORslpz JjnSGWQYRRG+ttl7i7zadalfnGEXwhyxMQ7H2Bv8KK2izUqDytRu5sqkLLehBsDdwh/6 VEXE39GaUrLpf8WZRuHrbILB27MTTKTyJSSUtjPWdsqWwhBls4RlVLjjI3ayBvMUbD7T o+adRMbLsoEz6PL1GSmQ7FCEPlsYt619EwpgsDZMFwiPeTcl5MvlFGBdatOIFnwEPWzg akfQxbXQ9tJYMeM7c2pMM9r8W0WS9W0cUPzxISg+mJf2ixhj5ln16kygDlwsACFVeKiz nHfQ== X-Gm-Message-State: AC+VfDzB3VwSZGLJygcDGgri38sRW4fb00Vw2KIKStNyG3VPB+L22mcU U61V785VUZJ+YxiNXu+5Nzf5n9aEOtALjg== X-Google-Smtp-Source: ACHHUZ71SGIe//211gfVhzFNxhPn/1XRCreYrBlzM1uBzMLH+8QRW+e1OgylV43VSS0djFPP9ifusg== X-Received: by 2002:a17:907:c1b:b0:94f:31da:8c38 with SMTP id ga27-20020a1709070c1b00b0094f31da8c38mr34622683ejc.24.1684255597505; Tue, 16 May 2023 09:46:37 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 09:46:37 -0700 (PDT) From: Juliana Sims X-Google-Original-From: Juliana Sims Message-Id: In-Reply-To: References: Date: Tue, 16 May 2023 01:13:00 -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)[native-inputs]: Remove glib, gmime, and gsettings-desktop-schemas. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bb3266b05a..81bc6c04e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12380,11 +12380,8 @@ (define-public geary cmake-minimal desktop-file-utils gettext-minimal - glib `(,glib "bin") - gmime gobject-introspection - gsettings-desktop-schemas itstool libarchive libxml2 From patchwork Tue May 16 16:24:14 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: 50050 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 D971427BBEA; Tue, 16 May 2023 17:48:03 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 6904A27BBE2 for ; Tue, 16 May 2023 17:48:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyxpa-0002k9-5i; Tue, 16 May 2023 12:47:22 -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 1pyxpL-0002iE-GZ for guix-patches@gnu.org; Tue, 16 May 2023 12:47:08 -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 1pyxpH-00071x-38 for guix-patches@gnu.org; Tue, 16 May 2023 12:47:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyxpG-0006sN-VY for guix-patches@gnu.org; Tue, 16 May 2023 12:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62635] [PATCH v4 4/4] gnu: geary: Update to 43.0. Resent-From: Liliana Marie Prikler 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.168425560926392 (code B ref 62635); Tue, 16 May 2023 16:47:02 +0000 Received: (at 62635) by debbugs.gnu.org; 16 May 2023 16:46:49 +0000 Received: from localhost ([127.0.0.1]:47187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxp2-0006rV-Vt for submit@debbugs.gnu.org; Tue, 16 May 2023 12:46:49 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:46102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyxox-0006qq-OD for 62635@debbugs.gnu.org; Tue, 16 May 2023 12:46:45 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-965c3f9af2aso2206595366b.0 for <62635@debbugs.gnu.org>; Tue, 16 May 2023 09:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684255598; x=1686847598; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Qm9hZQehC8WDtJNoQIZigEnUlhOe6En8AZKtuuZFwuY=; b=JaAGtxMRqHG8KlC1yWU4z3V57W+AlweTFeINXXr5zjN6Dc9mtiLyo146zWAjg0PT15 YuGOlBUmHw1NqBmtB15Onef6hf8/ZJeQd6od9xBovf3T+t/lSzT4LymPLr3F+1sEWZO8 sFHuqxm+oC7yvwRMifajTJfCXZHUilpcQLYcTMD8dnLnqYq5b/oJo9z7Bg9No56LIHOw 3H3gJOwuqsJvX2EkejWTpfk0aXR9DjKQN854/7AHabdsP0g9UezdnpTZ6P2BDSwU6O8N VnIXeM4dLJNlPYWTs8YDN8lG+za596Crgwrklf3Kwq2hM7FlfUYpiJNrQwBV/NCEf0gt SHlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684255598; x=1686847598; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qm9hZQehC8WDtJNoQIZigEnUlhOe6En8AZKtuuZFwuY=; b=c12rj4clN994LiiuTddOERHijGZxW4ukzpo+rHWkqAzn1HmffqiFOx2juE1U3SnxoT PkucJuPLCUYL0DTrzZfCf07a+34vzTlAozpc21dcM+TaNLZM12P8dp0JLl5PD5l2Qcfx f9BY8e2ypvSIMEmdwtcDxlAY94wTWyi47xSQpacLBUSQ98UcqBad5CeVKDjZ69IcUXI7 /gPljCU9OEZ8GlRBFwl3f8sqGs2MldTU55fKDtWZfMeBu5M5LYI/rEpgipY3uf0Jh9QO 9M6NE2xhHgMHq46Rjsiye9UWwXTy8mQ9w6y71JgVOyHIXTsP0XRIbzSXERrAYl3fBTZV Qj9g== X-Gm-Message-State: AC+VfDyNta+R23Y9+ZErT7XWxUbjYI0XF6rHqZESpCXBzJMYNsw0ei9g sYn97GYLbtW2dI2UIaMBmS7holyAbasgYw== X-Google-Smtp-Source: ACHHUZ5Go4SSIt84cUgFe8aYWMiuSaHaNDRhUc5wv8TK+ev42h9ZWHqcwTsgZRzwwsvDR6yiqjmjAA== X-Received: by 2002:a17:907:a4b:b0:958:514f:d88a with SMTP id be11-20020a1709070a4b00b00958514fd88amr31310621ejc.34.1684255598012; Tue, 16 May 2023 09:46:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 09:46:37 -0700 (PDT) Message-Id: In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 16 May 2023 18:24:14 +0200 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): Update to 43.0. [arguments]<#:phases>: Drop ‘disable-failing-tests’ and ‘generate-vapis’. Rename ‘disable-postinstall-script’ to ‘skip-gtk-update-icon-cache’ and adjust accordingly. [inputs]: Replace folks-with-libsoup2 with folks. Replace gnome-online-accounts-3.44 with gnome-online-accounts. Replace webkitgtk-with-libsoup2 with webkitgtk. [native-inputs]: Replace vala-0.52 with vala. Add gnutls. --- Hi Juliana, 1..3/4 have my rewordings for the commit messages, but more importantly, it turns out that geary can be refreshed to a newer version with fewer issues to fix :) Please confirm that this Geary also works for you. Cheers gnu/packages/gnome.scm | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 81bc6c04e9..bf5420b1f0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12306,16 +12306,16 @@ (define-public gnome-boxes (define-public geary (package (name "geary") - (version "40.0") + (version "43.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.gnome.org/GNOME/geary.git") - (commit (string-append "gnome-" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "04hvw86r8sczvjm1z3ls5y5y5h6nyfb648rjkfx05ib00mqq5v1x")))) + "05b8c5ljzx1ly7wq8jzpv8psxmsdlz395sr17xwj49nh495nflz5")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t @@ -12323,27 +12323,12 @@ (define-public geary #~(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 + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/post_install.py" - (("gtk-update-icon-cache") - "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-before 'check 'setup-home (lambda _ ;; Tests require a writable HOME. @@ -12354,11 +12339,11 @@ (define-public geary (setenv "DISPLAY" ":1")))))) (inputs (list enchant - folks-with-libsoup2 + folks gcr glib gmime - gnome-online-accounts-3.44 + gnome-online-accounts gsettings-desktop-schemas gspell gsound @@ -12373,7 +12358,7 @@ (define-public geary libstemmer libunwind sqlite - webkitgtk-with-libsoup2 + webkitgtk ytnef)) (native-inputs (list appstream-glib @@ -12381,13 +12366,14 @@ (define-public geary desktop-file-utils gettext-minimal `(,glib "bin") + gnutls ; for certtool gobject-introspection itstool libarchive libxml2 pkg-config python-minimal - vala-0.52 + vala xorg-server-for-tests)) (synopsis "GNOME email application built around conversations") (description