Re: [PR PATCH] [Updated] mu4e: update to 1.10.3

[pascal-huber <pascal-huber@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]

There is an updated pull request by pascal-huber against master on the void-packages repository

https://github.com/pascal-huber/void-packages mu4e_1.10.0_1
https://github.com/void-linux/void-packages/pull/43116

mu4e: update to 1.10.3
#### Testing the changes
- I tested the changes in this PR: **Yes**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl  (crossbuild)
  - aarch64 (crossbuild)
  - armv7l (crossbuild)

#### Notes
 - changed build style to `meson` as it is the primary build option of `mu`
 - removed `guile` build option because it depends on `guile-3.x`.
 - users will have to re-initialize their database (`mu-init(1)`)


A patch file from https://github.com/void-linux/void-packages/pull/43116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mu4e_1.10.0_1-43116.patch --]
[-- Type: text/x-diff, Size: 2533 bytes --]

From 88175071b1e8d98d8f82caebf921265a6d2128ea 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.3

---
 srcpkgs/mu4e/patches/fix-root-test.patch | 20 ++++++++++++++++++++
 srcpkgs/mu4e/template                    | 16 +++++-----------
 2 files changed, 25 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..009a30b4b1e4
--- /dev/null
+++ b/srcpkgs/mu4e/patches/fix-root-test.patch
@@ -0,0 +1,20 @@
+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 872c56e3..c4e7eeb2 100644
+--- a/lib/tests/test-mu-store.cc
++++ b/lib/tests/test-mu-store.cc
+@@ -470,13 +470,6 @@ test_store_fail()
+ 		const auto store = Store::make("/root/non-existent-path/12345");
+ 		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..43938e2dacba 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.3
 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=c83970fcb6163c27d135c207d1a5eb6f38a5732161741a4a88da2ae894e0245f
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}