* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2022-04-02 9:28 Matthew Smith
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Smith @ 2022-04-02 9:28 UTC (permalink / raw
To: gentoo-commits
commit: ba0c9a35185de0a8e42bad8e11b9e4540f0588e1
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 09:27:30 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 09:28:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0c9a35
net-mail/mu: add 1.7.12
Closes: https://bugs.gentoo.org/836618
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-mail/mu/Manifest | 1 +
net-mail/mu/files/mu-1.7.12-optional-mu4e.patch | 41 ++++++++++++
net-mail/mu/mu-1.7.12.ebuild | 83 +++++++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 23706f595cfd..8b5188322ef3 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1 +1,2 @@
DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
+DIST mu-1.7.12.tar.xz 2129072 BLAKE2B 3518a361bc06b632899f9296ec211dc926a07973433247bf6f9ecfb069dcfd8b762f358aa32418276bf7dcba40bad768dd4599534613a1fae285cef9c6ceedd0 SHA512 fe0f41520959df7f78525317bf5caad4ae7f7468ac6291b84c48805e133883192458a8f79a929c0ebda2e45ec2014db1aa72650d0a6e176d7678449be36fc4f2
diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
new file mode 100644
index 000000000000..0f14bf3249e2
--- /dev/null
+++ b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
@@ -0,0 +1,41 @@
+From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Sat, 2 Apr 2022 10:06:21 +0100
+Subject: [PATCH] build: add emacs option
+
+Without this option, mu4e will always be installed when Emacs is
+installed.
+---
+ meson.build | 2 +-
+ meson_options.txt | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 58ac9002..5f71d766 100644
+--- a/meson.build
++++ b/meson.build
+@@ -174,7 +174,7 @@ subdir('lib')
+ subdir('mu')
+ subdir('man')
+
+-if emacs.found()
++if get_option('emacs').enabled() and emacs.found()
+ subdir('mu4e')
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 0c70826e..34cb0c02 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -29,3 +29,8 @@ option('readline',
+ type: 'feature',
+ value: 'auto',
+ description: 'enable readline support for the mu4e repl')
++
++option('emacs',
++ type : 'feature',
++ value: 'disabled',
++ description: 'build mu4e')
+--
+2.35.1
+
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild
new file mode 100644
index 000000000000..02358e6b56c8
--- /dev/null
+++ b/net-mail/mu/mu-1.7.12.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/gmime:3.0
+ >=dev-libs/xapian-1.4:=
+ emacs? ( >=app-editors/emacs-25.3:* )
+ readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-apps/texinfo
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch )
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+ default
+
+ # Don't install NEWS.org into /usr/share/doc.
+ sed -i '/NEWS.org/,+1 d' meson.build || die
+
+ # Instead, put it in /usr/share/doc/${PF}.
+ sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature emacs)
+ $(meson_feature readline)
+ # NOTE: Guile interface is deprecated to be removed shortly.
+ -Dguile=disabled
+ -Dtoys=disabled
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Since meson no longer installs NEWS.org, install it with dodoc.
+ # Also, it must be uncompressed so that it can be viewed with
+ # mu4e-info.
+ docompress -x /usr/share/doc/${PF}/NEWS.org
+ dodoc NEWS.org
+}
+
+pkg_preinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "After upgrading from an old major version, you should"
+ elog "rebuild your mail index."
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ einfo "To use mu4e you need to configure it in your .emacs file"
+ einfo "See the manual for more information:"
+ einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+ elisp-site-regen
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2022-04-21 18:49 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-04-21 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 8e9615af681fb98060aa389a835bf9ea86561cbe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 18:29:57 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 18:49:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9615af
net-mail/mu: fix build with GCC 12
Closes: https://bugs.gentoo.org/839918
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-mail/mu/files/mu-1.7.12-gcc12.patch | 12 ++++++++++++
net-mail/mu/mu-1.7.12.ebuild | 5 ++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch
new file mode 100644
index 000000000000..f360351e17f4
--- /dev/null
+++ b/net-mail/mu/files/mu-1.7.12-gcc12.patch
@@ -0,0 +1,12 @@
+https://github.com/djcb/mu/pull/2224 (rebased)
+https://bugs.gentoo.org/839918
+--- a/lib/utils/mu-utils.cc
++++ b/lib/utils/mu-utils.cc
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <iostream>
+ #include <algorithm>
++#include <functional>
+ #include <numeric>
+
+ #include <glib.h>
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild
index 02358e6b56c8..902c7c8d9e4b 100644
--- a/net-mail/mu/mu-1.7.12.ebuild
+++ b/net-mail/mu/mu-1.7.12.ebuild
@@ -26,7 +26,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
+ "${FILESDIR}"/${PN}-1.7.12-gcc12.patch
+)
SITEFILE="70mu-gentoo-autoload.el"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2023-06-23 9:01 Matthew Smith
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Smith @ 2023-06-23 9:01 UTC (permalink / raw
To: gentoo-commits
commit: abb1775bd45ccf85f5b7fa418d8337e083267576
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 09:01:13 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 09:01:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb1775b
net-mail/mu: drop 1.8.14, 1.10.2
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-mail/mu/Manifest | 2 -
net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch | 37 ---------
net-mail/mu/mu-1.10.2.ebuild | 88 ----------------------
net-mail/mu/mu-1.8.14.ebuild | 92 -----------------------
4 files changed, 219 deletions(-)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 6cb431e132b7..d6a57a3b2cc8 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,4 +1,2 @@
-DIST mu-1.10.2.tar.xz 569692 BLAKE2B a75ad3d60806a5d336665b5dbc7d1f062928eff6fd2424651d3d85c4dd3134d1b4f912bd24120c14670dab49ef2e51056a0b130cc714edd0d56ab87bbdb7832b SHA512 2e8843846676c4f9ed9abb48bce8c52ffbfafcf1b7542c9f0663c2f5572c101871e935938f0406b284c6b78fb0fb190469d193151c5adbc50a10eea0edf76ccd
DIST mu-1.10.3.tar.xz 569740 BLAKE2B bfd332d77a0c8727beeac363c35199dd8da0b4dde940981845865eda7e0ff7a7bfcbfef76509ca407bea80b4b148b0b6bce79fa928b2c4df239b55325336c049 SHA512 dbc3946b50791bb01e640d7c07a5072c4c6381b576337899c32b0f0c8331b44ab328f3887eacfff4d5ec71144164a43dc2c1241330bf00226748485027e7f21b
DIST mu-1.10.4.tar.xz 570024 BLAKE2B 81d0ea6ac018a24eaa9f80e21fdbd6f4e67faba1cf3d6f93721ac32caf1f820b03adfbee096229da95caf229f7dc3c8e78008654296fb684fdc62e0cffab590d SHA512 7c58ddf65c4aaa555d38c3a10ecf5d6e170ff2914515f8f1242ca59226bda09057bcbff2bc5459b448c34c3bd3add9546fd71387891f8eef8b2ee9aa738982e1
-DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
diff --git a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch b/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
deleted file mode 100644
index 5b46732c805f..000000000000
--- a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e0b17e4e31acd5657a3488936ef619c5ae2dc689 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sat, 21 Jan 2023 19:39:09 +0100
-Subject: [PATCH] mu-error: Add missing <cstdint> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 13s libstdc++ reduced its dependency on some headers like <cstdint>, so it's
-no longer transitively included through various headers. Include it explicitly.
-
-See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
- ../lib/utils/mu-error.hh:36:26: error: ‘uint32_t’ does not name a type
- 36 | static constexpr uint32_t SoftError = 1 << 23;
- | ^~~~~~~~
----
-https://github.com/djcb/mu/pull/2421
-
- lib/utils/mu-error.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/utils/mu-error.hh b/lib/utils/mu-error.hh
-index c67fc5a1..61923c6c 100644
---- a/lib/utils/mu-error.hh
-+++ b/lib/utils/mu-error.hh
-@@ -21,6 +21,7 @@
- #define MU_ERROR_HH__
-
- #include <stdexcept>
-+#include <cstdint>
- #include "mu-utils-format.hh"
- #include "mu-util.h"
- #include <glib.h>
---
-2.39.1
-
diff --git a/net-mail/mu/mu-1.10.2.ebuild b/net-mail/mu/mu-1.10.2.ebuild
deleted file mode 100644
index 2acec2e5ddb5..000000000000
--- a/net-mail/mu/mu-1.10.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/gmime:3.0
- >=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-25.3:* )
- readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
- default
-
- # Don't install NEWS.org into /usr/share/doc.
- sed -i '/NEWS.org/,+1 d' meson.build || die
- sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
- # Don't compress the info file.
- sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
- # Instead, put it in /usr/share/doc/${PF}.
- sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature readline)
- -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
- # TODO: revisit this, it's not actually deprecated, just been reworked
- -Dguile=disabled
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Since meson no longer installs NEWS.org, install it with dodoc.
- # Also, it must be uncompressed so that it can be viewed with
- # mu4e-info.
- docompress -x /usr/share/doc/${PF}/NEWS.org
- dodoc NEWS.org
-
- # Same as above.
- docompress -x /usr/share/doc/${PF}/mu4e-about.org
- dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "After upgrading from an old major version, you should"
- elog "rebuild your mail index."
- fi
-}
-
-pkg_postinst() {
- if use emacs; then
- einfo "To use mu4e you need to configure it in your .emacs file"
- einfo "See the manual for more information:"
- einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.8.14.ebuild b/net-mail/mu/mu-1.8.14.ebuild
deleted file mode 100644
index f04ccccfcf43..000000000000
--- a/net-mail/mu/mu-1.8.14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/gmime:3.0
- >=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-25.3:* )
- readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.13-add-cstdint-inc.patch
-)
-
-src_prepare() {
- default
-
- # Don't install NEWS.org into /usr/share/doc.
- sed -i '/NEWS.org/,+1 d' meson.build || die
- sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
- # Don't compress the info file.
- sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
- # Instead, put it in /usr/share/doc/${PF}.
- sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature readline)
- -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
- # NOTE: Guile interface is deprecated to be removed shortly.
- -Dguile=disabled
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Since meson no longer installs NEWS.org, install it with dodoc.
- # Also, it must be uncompressed so that it can be viewed with
- # mu4e-info.
- docompress -x /usr/share/doc/${PF}/NEWS.org
- dodoc NEWS.org
-
- # Same as above.
- docompress -x /usr/share/doc/${PF}/mu4e-about.org
- dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "After upgrading from an old major version, you should"
- elog "rebuild your mail index."
- fi
-}
-
-pkg_postinst() {
- if use emacs; then
- einfo "To use mu4e you need to configure it in your .emacs file"
- einfo "See the manual for more information:"
- einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2024-04-01 11:34 Matthew Smith
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Smith @ 2024-04-01 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 88218a840c990719954f75cb24c6da4ebd33613e
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 11:33:20 2024 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 11:33:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88218a84
net-mail/mu: fix musl build
Closes: https://bugs.gentoo.org/928361
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-mail/mu/files/mu-1.12.2-musl.patch | 31 +++++++++++++++++++++++++++++++
net-mail/mu/mu-1.12.2.ebuild | 3 +++
2 files changed, 34 insertions(+)
diff --git a/net-mail/mu/files/mu-1.12.2-musl.patch b/net-mail/mu/files/mu-1.12.2-musl.patch
new file mode 100644
index 000000000000..35f6017e56f3
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.2-musl.patch
@@ -0,0 +1,31 @@
+From: https://github.com/djcb/mu/pull/2677
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 1 Apr 2024 11:23:39 +0000
+Subject: [PATCH] mu-utils: Fix build with musl
+
+In musl, `stdout` is a macro that expands to `(stdout)`, and
+`::(stdout)` is not valid C++.
+
+../mu-1.12.2/lib/utils/mu-utils.hh:268:32: error: expected
+ id-expression before '(' token
+ 268 | ::stdout);
+ | ^~~~~~
+
+Nothing in the Mu namespace is named stdout, so it is safe to drop
+the `::`.
+
+Bug: https://bugs.gentoo.org/928361
+--- a/lib/utils/mu-utils.hh
++++ b/lib/utils/mu-utils.hh
+@@ -265,7 +265,7 @@ bool fputs_encoded (const std::string& str, FILE *stream);
+ template<typename...T>
+ static inline bool mu_print_encoded(fmt::format_string<T...> frm, T&&... args) noexcept {
+ return fputs_encoded(fmt::format(frm, std::forward<T>(args)...),
+- ::stdout);
++ stdout);
+ }
+
+ /**
+--
+2.44.0
+
diff --git a/net-mail/mu/mu-1.12.2.ebuild b/net-mail/mu/mu-1.12.2.ebuild
index 04c44da48677..f4e55a3d9779 100644
--- a/net-mail/mu/mu-1.12.2.ebuild
+++ b/net-mail/mu/mu-1.12.2.ebuild
@@ -29,6 +29,9 @@ BDEPEND="
PATCHES=(
# https://bugs.gentoo.org/925503
"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+ # https://bugs.gentoo.org/928361
+ "${FILESDIR}"/${PN}-1.12.2-musl.patch
)
SITEFILE="70mu-gentoo-autoload.el"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2024-08-26 15:04 Matthew Smith
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Smith @ 2024-08-26 15:04 UTC (permalink / raw
To: gentoo-commits
commit: aa7754b844911e1163580d7f5162dffe89772187
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 15:02:46 2024 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 15:02:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7754b8
net-mail/mu: fix test_date_basic on 32-bit systems
Closes: https://bugs.gentoo.org/933093
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-mail/mu/files/mu-1.12.4-timet.patch | 34 ++++++++++++++++++++++
.../mu/{mu-1.12.4.ebuild => mu-1.12.4-r1.ebuild} | 3 ++
.../mu/{mu-1.12.6.ebuild => mu-1.12.6-r1.ebuild} | 3 ++
3 files changed, 40 insertions(+)
diff --git a/net-mail/mu/files/mu-1.12.4-timet.patch b/net-mail/mu/files/mu-1.12.4-timet.patch
new file mode 100644
index 000000000000..90ee1b60ba15
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.4-timet.patch
@@ -0,0 +1,34 @@
+From 075394b35f33bcf684eb0b0023a8640a3ce9c8f5 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 26 Aug 2024 14:46:54 +0000
+Subject: [PATCH] lib: use time_t_max for empty datetime
+
+In Mu::parse_date_time, when provided with an empty string, return
+time_t_max instead of G_MAXINT64. For systems with a 64-bit time_t, there
+is no difference. With a 32-bit time_t it caused a test to fail:
+
+ not ok /utils/date-basic - ERROR:../mu-1.12.4/lib/utils/tests/test-utils.cc:92
+ void test_date_basic(): assertion failed
+ (parse_date_time(std::get<0>(test), std::get<1>(test)).value_or(-1)
+ == std::get<2>(test)): (18446744073709551615 == 2147483647)
+
+This edge case probably only affected the test, as when other parts of
+the application call parse_date_time (e.g. mu-server.cc and
+mu-query-processor.cc), they check if the input string is empty first.
+
+Upstream: https://github.com/djcb/mu/pull/2749
+Bug: https://bugs.gentoo.org/933093
+--- a/lib/utils/mu-utils.cc
++++ b/lib/utils/mu-utils.cc
+@@ -493,7 +493,7 @@ Mu::parse_date_time(const std::string& dstr, bool is_first, bool utc)
+
+ /* one-sided dates */
+ if (dstr.empty())
+- return is_first ? 0 : G_MAXINT64;
++ return is_first ? time_t_min : time_t_max;
+ else if (dstr == "today" || dstr == "now")
+ return special_date_time(dstr, is_first);
+ else if (dstr.find_first_of("ymdwhMs") != std::string::npos)
+--
+2.46.0
+
diff --git a/net-mail/mu/mu-1.12.4.ebuild b/net-mail/mu/mu-1.12.4-r1.ebuild
similarity index 96%
rename from net-mail/mu/mu-1.12.4.ebuild
rename to net-mail/mu/mu-1.12.4-r1.ebuild
index 23e6d037c065..7d7aa9f54a3f 100644
--- a/net-mail/mu/mu-1.12.4.ebuild
+++ b/net-mail/mu/mu-1.12.4-r1.ebuild
@@ -34,6 +34,9 @@ BDEPEND="
PATCHES=(
# https://bugs.gentoo.org/925503
"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+ # https://bugs.gentoo.org/933093
+ "${FILESDIR}"/${PN}-1.12.4-timet.patch
)
DOC_CONTENTS="
diff --git a/net-mail/mu/mu-1.12.6.ebuild b/net-mail/mu/mu-1.12.6-r1.ebuild
similarity index 96%
rename from net-mail/mu/mu-1.12.6.ebuild
rename to net-mail/mu/mu-1.12.6-r1.ebuild
index 974051ec7307..dba97ac7c371 100644
--- a/net-mail/mu/mu-1.12.6.ebuild
+++ b/net-mail/mu/mu-1.12.6-r1.ebuild
@@ -34,6 +34,9 @@ BDEPEND="
PATCHES=(
# https://bugs.gentoo.org/925503
"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+ # https://bugs.gentoo.org/933093
+ "${FILESDIR}"/${PN}-1.12.4-timet.patch
)
DOC_CONTENTS="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2025-09-10 8:12 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-09-10 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 0c4900bf9cab7b1903ab640ccf380e045f3e23f3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 08:11:40 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 08:11:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4900bf
net-mail/mu: drop 1.12.6-r1, 1.12.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-mail/mu/Manifest | 2 -
net-mail/mu/files/mu-1.12.4-timet.patch | 34 -----------
net-mail/mu/mu-1.12.11.ebuild | 99 -------------------------------
net-mail/mu/mu-1.12.6-r1.ebuild | 100 --------------------------------
4 files changed, 235 deletions(-)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 3bc593492e4f..e10bf3898e24 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,4 +1,2 @@
-DIST mu-1.12.11.tar.xz 736032 BLAKE2B e770b756e80310935cda2fde864775fc7bf76a959b83fe3af22402b4d3fe42f0f88b6fabf7821d0fa2d78606ec6eab5379087c63c332f3d8ee21ddacabf75400 SHA512 93cf4af501c785010c2864237e3e6ef6b9285b9e724c94c33c5027e52494b63ccd03f8a9840f6c08532fdb1631db5e0d995e04da00d238297b707ae536f95c18
DIST mu-1.12.12.tar.xz 757272 BLAKE2B 3a73a41fdaa490b478b05d86493e42b4cb5c2059dd3c11b7f08201b48ff90a1df07a8f5d86a4ff31a62bbce9affc9a672581227782de5f3ed80cb9db28750443 SHA512 be6db3f713e5d69e08ddc91084e6ceb230a9da56f8b67b5d66bbe2d3f428ef74cbffb0fe89af43fa16bda86c46fa5d8a58989a0d4e195d349b8070083052dd20
-DIST mu-1.12.6.tar.xz 719392 BLAKE2B 75afdfa95f6711fb94e40757c23dd404e888610d36c7d6cbf29727770dbe8fcd1a207b7eae7e1cd06dcab2f088eb38cf7d045a59efbfa3e700d85a0e5f95164b SHA512 c3ba7b4c90d2749364f8c414d2eadcc4e6021237416d92cefd4542688b2fdafb1215a7b75b22fcafa68d349a22b69556d707e2c1e2752941e469a9231bb64ced
DIST mu-1.12.9.tar.xz 734240 BLAKE2B e536e832872406d865565ec1ae3775042b4fc9d2f50e2581f3d247007b8aeb68507e59d08168cbd16870dc907314c522bedead73a99ca2d5e8a42b8a67898e7b SHA512 27cd28a44dc6c8146891337be2c478aa7bf9e1dc458c30f3895b7bbcbafabd6b290e01e3f8c5db97f09b6cd68aebb3a0a0d3e7d53e25b4cba30613e7b8123d19
diff --git a/net-mail/mu/files/mu-1.12.4-timet.patch b/net-mail/mu/files/mu-1.12.4-timet.patch
deleted file mode 100644
index 90ee1b60ba15..000000000000
--- a/net-mail/mu/files/mu-1.12.4-timet.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 075394b35f33bcf684eb0b0023a8640a3ce9c8f5 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Mon, 26 Aug 2024 14:46:54 +0000
-Subject: [PATCH] lib: use time_t_max for empty datetime
-
-In Mu::parse_date_time, when provided with an empty string, return
-time_t_max instead of G_MAXINT64. For systems with a 64-bit time_t, there
-is no difference. With a 32-bit time_t it caused a test to fail:
-
- not ok /utils/date-basic - ERROR:../mu-1.12.4/lib/utils/tests/test-utils.cc:92
- void test_date_basic(): assertion failed
- (parse_date_time(std::get<0>(test), std::get<1>(test)).value_or(-1)
- == std::get<2>(test)): (18446744073709551615 == 2147483647)
-
-This edge case probably only affected the test, as when other parts of
-the application call parse_date_time (e.g. mu-server.cc and
-mu-query-processor.cc), they check if the input string is empty first.
-
-Upstream: https://github.com/djcb/mu/pull/2749
-Bug: https://bugs.gentoo.org/933093
---- a/lib/utils/mu-utils.cc
-+++ b/lib/utils/mu-utils.cc
-@@ -493,7 +493,7 @@ Mu::parse_date_time(const std::string& dstr, bool is_first, bool utc)
-
- /* one-sided dates */
- if (dstr.empty())
-- return is_first ? 0 : G_MAXINT64;
-+ return is_first ? time_t_min : time_t_max;
- else if (dstr == "today" || dstr == "now")
- return special_date_time(dstr, is_first);
- else if (dstr.find_first_of("ymdwhMs") != std::string::npos)
---
-2.46.0
-
diff --git a/net-mail/mu/mu-1.12.11.ebuild b/net-mail/mu/mu-1.12.11.ebuild
deleted file mode 100644
index 72946b39aa4e..000000000000
--- a/net-mail/mu/mu-1.12.11.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson readme.gentoo-r1
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-# mu: GPL-3+
-# + cli11: BSD
-# + fmt: MIT
-# + tl: CC0-1.0
-# + variant-lite: Boost-1.0
-LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/gmime:3.0
- >=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-25.3:* )
- readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
-"
-
-PATCHES=(
- # https://bugs.gentoo.org/925503
- "${FILESDIR}"/${PN}-1.12.0-no-python.patch
-)
-
-DOC_CONTENTS="
- To use mu4e you need to configure it in your .emacs file.
- See the manual for more information:
- https://www.djcbsoftware.nl/code/mu/mu4e/
-"
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
- default
-
- # Don't install NEWS.org into /usr/share/doc.
- sed -i '/NEWS.org/,+1 d' meson.build || die
- sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
- # Don't compress the info file.
- sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
- # Instead, put it in /usr/share/doc/${PF}.
- sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature readline)
- $(meson_feature test tests)
- -Dcld2=disabled
- -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
- # TODO: revisit this, it's not actually deprecated, just been reworked
- -Dguile=disabled
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Since meson no longer installs NEWS.org, install it with dodoc.
- # Also, it must be uncompressed so that it can be viewed with
- # mu4e-info.
- docompress -x /usr/share/doc/${PF}/NEWS.org
- dodoc NEWS.org
-
- if use emacs; then
- # Same as above.
- docompress -x /usr/share/doc/${PF}/mu4e-about.org
- dodoc mu4e/mu4e-about.org
-
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
- readme.gentoo_create_doc
- fi
-}
-
-pkg_postinst() {
- use emacs && readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.12.6-r1.ebuild b/net-mail/mu/mu-1.12.6-r1.ebuild
deleted file mode 100644
index d458d77cb7ca..000000000000
--- a/net-mail/mu/mu-1.12.6-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson readme.gentoo-r1
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-# mu: GPL-3+
-# + cli11: BSD
-# + fmt: MIT
-# + tl: CC0-1.0
-# + variant-lite: Boost-1.0
-LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/gmime:3.0
- >=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-25.3:* )
- readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
-"
-
-PATCHES=(
- # https://bugs.gentoo.org/925503
- "${FILESDIR}"/${PN}-1.12.0-no-python.patch
-
- # https://bugs.gentoo.org/933093
- "${FILESDIR}"/${PN}-1.12.4-timet.patch
-)
-
-DOC_CONTENTS="
- To use mu4e you need to configure it in your .emacs file.
- See the manual for more information:
- https://www.djcbsoftware.nl/code/mu/mu4e/
-"
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
- default
-
- # Don't install NEWS.org into /usr/share/doc.
- sed -i '/NEWS.org/,+1 d' meson.build || die
- sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
- # Don't compress the info file.
- sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
- # Instead, put it in /usr/share/doc/${PF}.
- sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature readline)
- -Dcld2=disabled
- -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
- # TODO: revisit this, it's not actually deprecated, just been reworked
- -Dguile=disabled
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Since meson no longer installs NEWS.org, install it with dodoc.
- # Also, it must be uncompressed so that it can be viewed with
- # mu4e-info.
- docompress -x /usr/share/doc/${PF}/NEWS.org
- dodoc NEWS.org
-
- if use emacs; then
- # Same as above.
- docompress -x /usr/share/doc/${PF}/mu4e-about.org
- dodoc mu4e/mu4e-about.org
-
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
- readme.gentoo_create_doc
- fi
-}
-
-pkg_postinst() {
- use emacs && readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
@ 2025-10-02 4:33 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-10-02 4:33 UTC (permalink / raw
To: gentoo-commits
commit: 0554d4de0f29b0b3e8dc87ece997b5668f25960e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 2 04:31:18 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 2 04:32:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0554d4de
net-mail/mu: add 1.12.13
Been tending to use bundled libfmt but upstream default to using a system
copy here so let's give it a go (though funny we needed a patch already).
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-mail/mu/Manifest | 1 +
net-mail/mu/files/mu-1.12.13-libfmt-12.patch | 27 +++++++
net-mail/mu/mu-1.12.13.ebuild | 104 +++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index e10bf3898e24..860bcb930c38 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,2 +1,3 @@
DIST mu-1.12.12.tar.xz 757272 BLAKE2B 3a73a41fdaa490b478b05d86493e42b4cb5c2059dd3c11b7f08201b48ff90a1df07a8f5d86a4ff31a62bbce9affc9a672581227782de5f3ed80cb9db28750443 SHA512 be6db3f713e5d69e08ddc91084e6ceb230a9da56f8b67b5d66bbe2d3f428ef74cbffb0fe89af43fa16bda86c46fa5d8a58989a0d4e195d349b8070083052dd20
+DIST mu-1.12.13.tar.xz 775148 BLAKE2B 946a0bfefb9f143354f6870616728512863a49db14b774fcd10771bd281328533a2f938195731caaef5aa7ffc1ae841e66d186baa479f7ab1c1a750cea71ed05 SHA512 88460b3d34dea78fcf85875c444fbe24277a9d315da0448880307c50034cc4ec8b5687227358bdc47f7713852ba60fa687fdc5a5ed94d469617b6fc8c7162ade
DIST mu-1.12.9.tar.xz 734240 BLAKE2B e536e832872406d865565ec1ae3775042b4fc9d2f50e2581f3d247007b8aeb68507e59d08168cbd16870dc907314c522bedead73a99ca2d5e8a42b8a67898e7b SHA512 27cd28a44dc6c8146891337be2c478aa7bf9e1dc458c30f3895b7bbcbafabd6b290e01e3f8c5db97f09b6cd68aebb3a0a0d3e7d53e25b4cba30613e7b8123d19
diff --git a/net-mail/mu/files/mu-1.12.13-libfmt-12.patch b/net-mail/mu/files/mu-1.12.13-libfmt-12.patch
new file mode 100644
index 000000000000..105738670ccb
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.13-libfmt-12.patch
@@ -0,0 +1,27 @@
+https://github.com/djcb/mu/commit/0a4fabbf446d15b538600dfe7d879cad70ce941e
+
+From 0a4fabbf446d15b538600dfe7d879cad70ce941e Mon Sep 17 00:00:00 2001
+From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
+Date: Sun, 28 Sep 2025 18:52:56 +0300
+Subject: [PATCH] utils: avoid fmt:gmtime/fmt::localtime
+
+They've been deprecated and give build warnings with new enough libfmt.
+---
+ lib/utils/mu-utils.hh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/utils/mu-utils.hh b/lib/utils/mu-utils.hh
+index ecdc2f24d..32bb0ddb7 100644
+--- a/lib/utils/mu-utils.hh
++++ b/lib/utils/mu-utils.hh
+@@ -145,7 +145,9 @@ auto mu_join(Range&& range, std::string_view sepa) {
+ template <typename T=::time_t>
+ std::tm mu_time(T t={}, bool use_utc=false) {
+ ::time_t tt{static_cast<::time_t>(t)};
+- return use_utc ? fmt::gmtime(tt) : fmt::localtime(tt);
++ std::tm time_tm = {};
++ use_utc ? gmtime_r(&tt, &time_tm) : localtime_r(&tt, &time_tm);
++ return time_tm;
+ }
+
+ using StringVec = std::vector<std::string>;
diff --git a/net-mail/mu/mu-1.12.13.ebuild b/net-mail/mu/mu-1.12.13.ebuild
new file mode 100644
index 000000000000..e5b568318ab7
--- /dev/null
+++ b/net-mail/mu/mu-1.12.13.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson readme.gentoo-r1
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+# mu: GPL-3+
+# + tl: CC0-1.0
+# + variant-lite: Boost-1.0
+LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-cpp/cli11-2.4
+ dev-libs/glib:2
+ >=dev-libs/gmime-3.2:3.0
+ >=dev-libs/libfmt-11.1:=
+ >=dev-libs/xapian-1.4:=
+ emacs? ( >=app-editors/emacs-25.3:* )
+ readline? ( sys-libs/readline:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-apps/texinfo
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # https://bugs.gentoo.org/925503
+ "${FILESDIR}"/${PN}-1.12.0-no-python.patch
+ "${FILESDIR}"/${P}-libfmt-12.patch
+)
+
+DOC_CONTENTS="
+ To use mu4e you need to configure it in your .emacs file.
+ See the manual for more information:
+ https://www.djcbsoftware.nl/code/mu/mu4e/
+"
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+ default
+
+ # Don't install NEWS.org into /usr/share/doc.
+ sed -i '/NEWS.org/,+1 d' meson.build || die
+ sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+ # Don't compress the info file.
+ sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+ # Instead, put it in /usr/share/doc/${PF}.
+ sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature readline)
+ $(meson_feature test tests)
+ -Dcld2=disabled
+ -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+ # TODO: revisit this, it's not actually deprecated, just been reworked
+ -Dguile=disabled
+ -Dscm=disabled
+ -Duse-embedded-fmt=false
+ -Duse-embedded-cli11=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Since meson no longer installs NEWS.org, install it with dodoc.
+ # Also, it must be uncompressed so that it can be viewed with
+ # mu4e-info.
+ docompress -x /usr/share/doc/${PF}/NEWS.org
+ dodoc NEWS.org
+
+ if use emacs; then
+ # Same as above.
+ docompress -x /usr/share/doc/${PF}/mu4e-about.org
+ dodoc mu4e/mu4e-about.org
+
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ readme.gentoo_create_doc
+ fi
+}
+
+pkg_postinst() {
+ use emacs && readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-10-02 4:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-10 8:12 [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-10-02 4:33 Sam James
2024-08-26 15:04 Matthew Smith
2024-04-01 11:34 Matthew Smith
2023-06-23 9:01 Matthew Smith
2022-04-21 18:49 Sam James
2022-04-02 9:28 Matthew Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox