From c4f7f8548f01dc0a86a8780a6c2cb2a7e20b591a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Thu, 30 Mar 2023 16:02:31 +0200
Subject: [PATCH] mu4e: update to 1.10.1

---
 srcpkgs/mu4e/patches/fix-root-test.patch | 25 ++++++++++++++++++++++++
 srcpkgs/mu4e/template                    | 16 +++++----------
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/mu4e/patches/fix-root-test.patch

diff --git a/srcpkgs/mu4e/patches/fix-root-test.patch b/srcpkgs/mu4e/patches/fix-root-test.patch
new file mode 100644
index 000000000000..b7c28397d6d4
--- /dev/null
+++ b/srcpkgs/mu4e/patches/fix-root-test.patch
@@ -0,0 +1,25 @@
+Remove a test which fails when run as root.
+
+diff --git a/lib/tests/test-mu-store.cc b/lib/tests/test-mu-store.cc
+index 872c56e..fa5130a 100644
+--- a/lib/tests/test-mu-store.cc
++++ b/lib/tests/test-mu-store.cc
+@@ -471,12 +471,12 @@ test_store_fail()
+ 		g_assert_false(!!store);
+ 	}
+ 
+-	{
+-		const auto store = Store::make_new("/../../root/non-existent-path/12345",
+-						   "/../../root/non-existent-path/54321",
+-						   {}, {});
+-		g_assert_false(!!store);
+-	}
++	// {
++	// 	const auto store = Store::make_new("/../../root/non-existent-path/12345",
++	// 					   "/../../root/non-existent-path/54321",
++	// 					   {}, {});
++	// 	g_assert_false(!!store);
++	// }
+ }
+ 
+ int
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index 0cf2c72e00a2..71f71ada7c06 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,22 +1,16 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.8.14
+version=1.10.1
 revision=1
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+build_style=meson
+hostmakedepends="emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel"
 short_desc="Maildir-utils indexer/searcher and associated Emacs client"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 changelog="https://github.com/djcb/mu/raw/master/NEWS.org"
 distfiles="https://github.com/djcb/mu/releases/download/v${version}/mu-${version}.tar.xz"
-checksum=1a9c5e15b5e8b67622f7e58dfadd453abf232c0b715bd5f89b955e704455219c
+checksum=00cba4b6a54151de8f3fb06d4d6a180cd20e0f1780cec751890c647ae60e944f
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}