From patchwork Sat Aug 6 02:36:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 41305 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 01D8827BBE9; Sat, 6 Aug 2022 03:48:10 +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, 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 BECD427BBEA for ; Sat, 6 Aug 2022 03:48:08 +0100 (BST) Received: from localhost ([::1]:44772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oK9rD-0000Y8-V4 for patchwork@mira.cbaines.net; Fri, 05 Aug 2022 22:48:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oK9gU-0008Kq-An for guix-patches@gnu.org; Fri, 05 Aug 2022 22:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oK9gU-0006qj-2Y for guix-patches@gnu.org; Fri, 05 Aug 2022 22:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oK9gT-0006Cm-Tx for guix-patches@gnu.org; Fri, 05 Aug 2022 22:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57013] [PATCH] Fix mu4e in mu 1.8.7. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Aug 2022 02:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57013@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165975338023803 (code B ref -1); Sat, 06 Aug 2022 02:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Aug 2022 02:36:20 +0000 Received: from localhost ([127.0.0.1]:60839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oK9fo-0006Bp-1h for submit@debbugs.gnu.org; Fri, 05 Aug 2022 22:36:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:60098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oK9fk-0006Bg-CP for submit@debbugs.gnu.org; Fri, 05 Aug 2022 22:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oK9fk-0008CM-7l for guix-patches@gnu.org; Fri, 05 Aug 2022 22:36:16 -0400 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]:43875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oK9fi-0006jk-By for guix-patches@gnu.org; Fri, 05 Aug 2022 22:36:15 -0400 Received: by mail-lj1-x234.google.com with SMTP id bx38so4725071ljb.10 for ; Fri, 05 Aug 2022 19:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc; bh=YapKcrwhoQ725Hwf+gyHQBLK2aF0ZLlIdaAd23mCZEY=; b=pFVbLsAv/PtnKlnSoVkGoDf/ZLTQq9tUAqmy0YDsiZF/rIWfc/pXrXtTcd3HBeiBFt MY53eZn1kVrHaJt3j8GCyBFPy8i84ZiJND9Y0SDAj1CZT/5H8cFjmRb/mR9y3XGDbDxq TRMcmmC/DAb7cnj7NHtaXGQX59XF9DFlNBNr1Rfw5gJu4OYX9fImizoXxArJF6aK1K28 bOU/W2jqOztvkZkUcxSfO2OEQW+YwJVsMUxrVDK3+l+uYgZpZ/IrK2trbm+8aoUcTLVW 3rc3jg7SNxIW7HZ7tvvt7bYvt65sggEYD7GY18HgvIqAz16l0Ac2VCCNr3RUsBHxzubg N1ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=YapKcrwhoQ725Hwf+gyHQBLK2aF0ZLlIdaAd23mCZEY=; b=XcjVHzavhqpqfkmC7+kTs50QEk+M6CQE6tQ5LIUNulfJKu6MgGKilJ+Hdz99kHlzA/ r5l505A/0NHizkSZLOcmmTBCG/asw4sQbfGWMaH4ZN2hSEHuCjN1z9SYZ9/ovFKrU51R /nT5ywElWQUxTcErM2jLuqd2ITL65lU8A5xNBdr1mjnGszte0t6IPN+Kpi/ZtKpognwM g12oYoSn9jM+AQA+yyvr27x1/fPzulIJZ0o67pQg1m3R9NyWDoRNnrT+N5FYKoRsevG6 OqatvX+2DovKjJVvot822S6I6NAwgb51By7dvcqnNWuwn6enn44MXIe4cSjOQvxoGtHm 1h1w== X-Gm-Message-State: ACgBeo2Jl3hZiB/73igCCA6YA93lDb6wpOv5mrQiYscXzZUZf7i3Luyi Zobhpp2q0fSQE7H+guuVw5GN7O+5hFBOf9s5cizgUPyF X-Google-Smtp-Source: AA6agR7Z19Gw+rYxsQLIQB0CP3o7SRMwTNefoBGYw4cVkczFIU6ihpOYwBuN/E3cokUT+QBTNjQU5uzci+QxAca8vj8= X-Received: by 2002:a2e:97c7:0:b0:25e:59a5:bf25 with SMTP id m7-20020a2e97c7000000b0025e59a5bf25mr3005756ljj.291.1659753371545; Fri, 05 Aug 2022 19:36:11 -0700 (PDT) MIME-Version: 1.0 From: Zhu Zihao Date: Fri, 5 Aug 2022 21:36:00 -0500 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=cjpeople2013@gmail.com; helo=mail-lj1-x234.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 05 Aug 2022 22:48:01 -0400 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" X-getmail-retrieved-from-mailbox: Patches From d3b7c19aa63d1585cb0a063fa1757d8974c1756d Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 6 Aug 2022 00:11:29 +0800 Subject: [PATCH 2/2] gnu: mu: Use G-expressions. * gnu/packages/mail.scm (mu)[arguments]: Use G-expressions. --- gnu/packages/mail.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 544e5cc247..6544a8dd7c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1181,29 +1181,30 @@ (define-public mu (inputs (list glib gmime xapian)) (arguments - `(#:modules ((guix build meson-build-system) + (list + #:modules '((guix build meson-build-system) (guix build emacs-utils) (guix build utils)) - #:imported-modules (,@%meson-build-system-modules + #:imported-modules `(,@%meson-build-system-modules (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-bin-references - (lambda _ - (substitute* '("guile/tests/test-mu-guile.cc" - "mu/tests/test-mu-cmd.cc" - "mu/tests/test-mu-cmd-cfind.cc" - "mu/tests/test-mu-query.cc") - (("/bin/sh") (which "sh"))) - (substitute* '("lib/tests/bench-indexer.cc" - "lib/utils/mu-utils.cc") - (("/bin/rm") (which "rm"))))) - (add-after 'install 'install-emacs-autoloads - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "mu4e" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/mu4e"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-bin-references + (lambda _ + (substitute* '("guile/tests/test-mu-guile.cc" + "mu/tests/test-mu-cmd.cc" + "mu/tests/test-mu-cmd-cfind.cc" + "mu/tests/test-mu-query.cc") + (("/bin/sh") (which "sh"))) + (substitute* '("lib/tests/bench-indexer.cc" + "lib/utils/mu-utils.cc") + (("/bin/rm") (which "rm"))))) + (add-after 'install 'install-emacs-autoloads + (lambda* (#:key outputs #:allow-other-keys) + (emacs-generate-autoloads + "mu4e" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/mu4e"))))))) (home-page "https://www.djcbsoftware.nl/code/mu/") (synopsis "Quickly find emails") (description -- 2.37.1