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