From patchwork Sat Jul 31 11:02:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31666 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 36ADE27BC6B; Sat, 31 Jul 2021 12:06:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 89A0527BC78 for ; Sat, 31 Jul 2021 12:06:10 +0100 (BST) Received: from localhost ([::1]:40568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9moj-00038R-GP for patchwork@mira.cbaines.net; Sat, 31 Jul 2021 07:06:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9mob-00037t-Vi for guix-patches@gnu.org; Sat, 31 Jul 2021 07:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9mob-0007Bm-NU for guix-patches@gnu.org; Sat, 31 Jul 2021 07:06:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9mob-0006fZ-J2 for guix-patches@gnu.org; Sat, 31 Jul 2021 07:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49751] [PATCH] gnu: mu: Update to 1.6.1. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Jul 2021 11:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Langlois Cc: 49751@debbugs.gnu.org X-Debbugs-Original-Cc: 49751@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162772953325600 (code B ref -1); Sat, 31 Jul 2021 11:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2021 11:05:33 +0000 Received: from localhost ([127.0.0.1]:33329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9mo8-0006ep-Pu for submit@debbugs.gnu.org; Sat, 31 Jul 2021 07:05:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:56298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9mo1-0006eW-NF for submit@debbugs.gnu.org; Sat, 31 Jul 2021 07:05:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9mo1-0002xU-Hu for guix-patches@gnu.org; Sat, 31 Jul 2021 07:05:25 -0400 Received: from mout.gmx.net ([212.227.15.19]:41459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9mny-0006cr-Ba for guix-patches@gnu.org; Sat, 31 Jul 2021 07:05:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627729509; bh=Db7j+RjFttKw/0aOA777prhW7XKHSeCLmWm0pMToLak=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=DzxUz0QWYoHCjFKZm8fbeerBTqWTM3GBnp2twbAVHgQNql/33TNMb35GO6HpuYJEY f/AkZY3U18TuC18aBaaJwxcM3jmnKsXtzkYUQQqIJq1LCOEcJUoodT2vHCTDciteP5 aUntr2vPyuupzU34pHqZ0YiDE4rQgls4qZ4QLw1o= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MAfUo-1mKk5V1XFA-00B1cI; Sat, 31 Jul 2021 13:05:09 +0200 References: <87im0v5uk3.fsf@gmx.com> <87bl6npczj.fsf@gmx.com> <87wnpah54f.fsf@gmx.com> User-agent: mu4e 1.6.0; emacs 27.2 From: Pierre Langlois Date: Sat, 31 Jul 2021 12:02:22 +0100 In-reply-to: <87wnpah54f.fsf@gmx.com> Message-ID: <87mtq2hhgb.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:FDP3G1oy7fpTavpVmK2iBoMTzq3OssLywwE/ld43wS2x5Uc4jzB dQWMhzoNLGkSgwQkI8K5oOXyVlihCpUC15BxAsjhqEJtHdEx2NCsjSsXbWL1HRMT6PFibSc dts7RZhOsV0/4ei4h6fqg4mZUH7JC6pRKgINpdpRSJX5SQgb4j+7ZIPz2hXjB2Sz4e4E10P G2RXEQSGbpz1Sw+JUBeVQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Icbv3Kl8J9E=:4/Xt/2TmqCAGCvCenWHv2p tOW+WbR5qgYxOlMx5iKnxsgSvImFHMeQtGuiLwd0quCUL39vYu5W5fX3Zr6iRXZfIIDbb426y tLnZsorHd2IK6+wLJm++IV+R6r3RGohKZu/ONVcxuIcQfqjiJzFnRamVJ55u0/5FuP+BRCxq/ xtgoYqgmqwoKi7duxwTEV36/l10DOkqn+gWUDSA4isG4QlBrldLoSdnIPi7lXOU4ndSo9Ss4c Uwty8KfuuX80H19B25EkDE+I35E2W8TtcCvpPEfkGYOKvH167n67zpeNJG62sU/GlCTCu+PNS fHF0f/Pw5ec3bCqZeKB5VmVYAZnJo604iyYuR4R2MWPDczfb/F6Hs8LYwMb1QMK3PhwjmYkYU aYmk6mqwCnSJ0gfIc+8wq8F50F33JrB71yLrxdjBn3me5UMOwr8HPFcao3V3QeoLqz+t1h7bO 0FH1hKrKTpSY6SCecG5b+NuyXv7jBnDq7jlebRolwUhPw2LmIwhqstDpf1E6hdiOXX//F1hyY IkkxFGzBJ78Z6RYPgmIwR8sR/JsJDTeUtot00/cCsVxmkpk2iuZT5euppKtukRQKPrcbUdxDa Uw2GArHSb6pV0Jkvv0CwF1JQVbnMqgvdJmuGQ94xPT605CeK1NPYKn7530EPARJnQ08yFNdzL 2xhgdzgLin1w5bGxkX9e4gzr54E8A2RUOnWvd5+0Ttvf5tCvvwrUqjBv2z3cvdhcEfo6FPFBE NWRzUK1H6ibe6xH6YBCNFuZ8ZRapBUMQRldDsjMb4OuYV8tb0Kj5/Xa32Hj5E7a26vpRmPkg3 y0yy+UZtChgaKpdwCJaUlgjmkGmOUJFfFbQFGHXH4ilrm348qnDvisrdO2jumUO9e4zyHZ4vN oVn017IDiserBU7qi5d1/b1TYUtcDMTvtj8tfAdBLWn9ZTJ0AODn2JwbfZczm5K54vQsboNLO NhEWqsae3EvG5BekASxI2n5L+qNYlqGi98PNq6KA2gwK/I0KwLEtOMZgLHwKdfpgJ1UJVGsiz GmfVeXVzIzsDkBTfJzZgErauaLjLOshk+c5GoRyTrs0lGHeSBL6FErdpqzTQLL/JTLzFnG2xp bGx16kJb4bVasgjxJgweXKRdY9HOXbfxQ+hxXeWcVSoZ/NWDtFe0uDVdw== Received-SPF: pass client-ip=212.227.15.19; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-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 Hi, Pierre Langlois writes: > [[PGP Signed Part:Undecided]] > > Pierre Langlois writes: > >> [[PGP Signed Part:Undecided]] >> >> Pierre Langlois writes: >> >>> Hi Guix! >>> >>> I just noticed a new version of Mu was just released so here's a patch! >>> OK to apply? Sent from mu4e 1.6 :-) >> >> I just realised the emacs UI isn't showing me new unread mail after >> updating so I had to revert back :-/. Will have to do a bit of digging >> before pushing this. > > Turns out we need to remove the xapian database (deleting .cache/mu and > regenerating it) https://github.com/djcb/mu/issues/2058 > > That worked for me, although it's a shame that there are no warnings, > the issue also mentions another potential problem, so we might want to > wait a little bit before updating in case upstream releases a point > release with a smoother transition. 1.6.1 was just released, users should get a warning that they need to run `mu init' https://github.com/djcb/mu/releases/tag/1.6.1 Ok to apply? Thanks, Pierre From 176a8cc7f8309bc0a13250ff3cf817e042f17d7c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 27 Jul 2021 21:09:49 +0100 Subject: [PATCH] gnu: mu: Update to 1.6.1. * gnu/packages/mail.scm (mu): Update to 1.6.1. [inputs]: Use guile-3.0. [arguments]: Remove autotools substitutions for guile-2.2. Update 'patch-bin-sh-in-tests phase to new tests. Do not return #t in the remaining phases. --- gnu/packages/mail.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c207d363cf..5199d0b02e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1146,7 +1146,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.15") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -1154,7 +1154,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0ailz0k5fdgq6gdl5m7jxy315b7qn5ckj6xwd49hsiq9vqblwlpp")))) + "1167sxh49v8wgvvgsgchnybz59q6s816qk59bb0qgw7ia0nad70w")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1163,7 +1163,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") ("tzdata" ,tzdata-for-tests))) ; for mu/test/test-mu-query.c (inputs `(("xapian" ,xapian) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("glib" ,glib) ("gmime" ,gmime))) (arguments @@ -1181,43 +1181,32 @@ security functionality including PGP, S/MIME, SSH, and SSL.") ;; the lispdir anyway, so we have to modify "configure.ac". (lambda _ (substitute* "configure" - (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "") - ;; Use latest Guile - (("guile-2.0") "guile-2.2")) - (substitute* '("guile/Makefile.in" - "guile/mu/Makefile.in") - (("share/guile/site/2.0/") "share/guile/site/2.2/")) - #t)) + (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")))) (add-after 'unpack 'patch-bin-sh-in-tests (lambda _ - (substitute* '("guile/tests/test-mu-guile.c" - "mu/test-mu-cmd.c" - "mu/test-mu-cmd-cfind.c" - "mu/test-mu-query.c" - "mu/test-mu-threads.c") - (("/bin/sh") (which "sh"))) - #t)) + (substitute* '("guile/tests/test-mu-guile.cc" + "mu/test-mu-cmd.cc" + "mu/test-mu-cmd-cfind.cc" + "mu/test-mu-query.cc") + (("/bin/sh") (which "sh"))))) (add-before 'install 'fix-ffi (lambda* (#:key outputs #:allow-other-keys) (substitute* "guile/mu.scm" (("\"libguile-mu\"") (format #f "\"~a/lib/libguile-mu\"" - (assoc-ref outputs "out")))) - #t)) + (assoc-ref outputs "out")))))) (add-before 'check 'check-tz-setup (lambda* (#:key inputs #:allow-other-keys) ;; For mu/test/test-mu-query.c (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - #t)) + "/share/zoneinfo")))) (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")) - #t))))) + "/share/emacs/site-lisp"))))))) (home-page "https://www.djcbsoftware.nl/code/mu/") (synopsis "Quickly find emails") (description -- 2.32.0