From patchwork Mon Aug 1 13:41:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 41082 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 12A1C27BBE9; Mon, 1 Aug 2022 14:49:34 +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_INVALID, DKIM_SIGNED,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 6C68227BBEA for ; Mon, 1 Aug 2022 14:49:30 +0100 (BST) Received: from localhost ([::1]:48540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIVnV-0006pl-Fv for patchwork@mira.cbaines.net; Mon, 01 Aug 2022 09:49:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIVgI-000557-W4 for guix-patches@gnu.org; Mon, 01 Aug 2022 09:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIVgI-0004Wp-NS for guix-patches@gnu.org; Mon, 01 Aug 2022 09:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIVgI-00060c-BL for guix-patches@gnu.org; Mon, 01 Aug 2022 09:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56872] [PATCH v2] gnu: mu: Update to 1.8.7. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Aug 2022 13:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56872 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56872@debbugs.gnu.org Received: via spool by 56872-submit@debbugs.gnu.org id=B56872.165936127423035 (code B ref 56872); Mon, 01 Aug 2022 13:42:02 +0000 Received: (at 56872) by debbugs.gnu.org; 1 Aug 2022 13:41:14 +0000 Received: from localhost ([127.0.0.1]:39782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIVfV-0005zR-29 for submit@debbugs.gnu.org; Mon, 01 Aug 2022 09:41:14 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:40330 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIVfP-0005yw-PY for 56872@debbugs.gnu.org; Mon, 01 Aug 2022 09:41:11 -0400 Received: from localhost ([127.0.0.1]:40532) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1oIVet-0007mx-2b for 56872@debbugs.gnu.org; Mon, 01 Aug 2022 13:40:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=biWlONADaJj18s6Q1NhHAF99sjy8cAv26yUyxMXyJtY=; b=HMWm5yIqXe94ssCfLvtxORMUup zxYr+gmxuwdM5BArrwWBR/Q5ng4924AxS7DTItWP1oVvxOHY3bEdBb7X7JN8ykNJEWiCffq5PaupW dA848SsA1MnLFfE0vPlndBNDJ+Y+pvA7KBk9Eu2Zw/T4UZatsK8NfeZmYkegTygLD72UCmat9upTF j2gJ0tOWQUbFBjR8qNk62jjb1EfgTp8Z2IYKvGk3h09z6gb4czKCX+A3X5+WZZjxlmKf004r99K2c 2fgheDNSu5UB7TXEZLgZOHzZRYNxcztpIp5zyXV5T6wSpXJHwCocdEI+HHY1dDiVgOl6E3r+O/O5M HB5D0xgHqWQlDFK4i5sW1amp5wXmRvx0FgjBQVF/pXfjVsxEvF2CaWabHToYsVmhjeiQwUZxFdoln YT36cKaL1nXIzq516U9y5S8alP31h5/x2S6jz/l0pduVvBMY0E9EW5P4M0tWa+N/t3EklWV9GHL6g I0EOb1mXliEmDilPxN5pUwIY; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1oIVfJ-0006ls-1D for 56872@debbugs.gnu.org; Mon, 01 Aug 2022 16:41:01 +0300 From: muradm Date: Mon, 1 Aug 2022 16:41:01 +0300 Message-Id: <20220801134101.26024-1-mail@muradm.net> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220801131159.20007-1-mail@muradm.net> References: <20220801131159.20007-1-mail@muradm.net> 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" X-getmail-retrieved-from-mailbox: Patches since 1.8: * mu is built with meson build system. * guile support is deprecated. * gnu/packages/mail.scm (mu): Update to 1.8.7. [source]: Changing from release tarball to checkout. [build-system]: Changing to meson-build-system. [native-inputs]: Removed glib:bin and tzdata, added gnupg amd texinfo. [inputs]: Removed guile added coreutils (for /bin/rm command). [arguments]: Removed obsolete 'patch-configure, 'fix-ffi and 'check-tz-setup phases. Added 'patch-bin-in-sources for introduced /bin/rm command. Renamed and updated 'patch-bin-sh-in-tests to 'patch-bin-in-tests. --- gnu/packages/mail.scm | 66 +++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 556c5b4305..2c06a1a9ba 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2022 Justin Veilleux ;;; Copyright © 2022 Thiago Jung Bauermann ;;; Copyright © 2022 Guillaume Le Vaillant +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -1161,57 +1162,42 @@ (define-public emacs-mew (define-public mu (package (name "mu") - (version "1.6.11") + (version "1.8.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" version "/" - "mu-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/djcb/mu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13gchks9znyw0axw1wlks7f7h4442rfagmj7kx0jm3qhvi0b5sk0")))) - (build-system gnu-build-system) + "0yfbw234yqnqfnsn5bj1hqwpy78pkxn05vl18z8nvsqdmpzal4gx")))) + (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester - ("emacs" ,emacs-minimal) - ("tzdata" ,tzdata-for-tests))) ; for mu/test/test-mu-query.c + (list emacs-minimal + gnupg ; for tests + pkg-config + texinfo)) (inputs - (list xapian guile-3.0 glib gmime)) + (list glib gmime xapian)) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + `(#:modules ((guix build meson-build-system) + (guix build emacs-utils) + (guix build utils)) + #:imported-modules (,@%meson-build-system-modules (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-configure - ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e", - ;; so our Emacs package can't find it. Setting "--with-lispdir" - ;; configure flag doesn't help because "mu4e" will be added to - ;; the lispdir anyway, so we have to modify "configure.ac". - (lambda _ - (substitute* "configure" - (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")))) - (add-after 'unpack 'patch-bin-sh-in-tests + (add-after 'unpack 'patch-bin-in-tests (lambda _ (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")))))) - (add-before 'check 'check-tz-setup - (lambda* (#:key inputs #:allow-other-keys) - ;; For mu/test/test-mu-query.c - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")))) + "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/utils/mu-utils.cc" + "lib/tests/bench-indexer.cc") + (("/bin/rm") (which "rm"))))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads