[PR PATCH] mu: update to 1.4

[PR PATCH] mu: update to 1.4

[emacsomancer]

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

There is a new pull request by emacsomancer against master on the void-packages repository

https://github.com/emacsomancer/void-packages mu1.4
https://github.com/void-linux/void-packages/pull/21131

mu: update to 1.4


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mu1.4-21131.patch --]
[-- Type: text/x-diff, Size: 1241 bytes --]

From 7d411a2b5b64b1281606ca3a87ad1831ce2883cf Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 18 Apr 2020 13:24:21 -0600
Subject: [PATCH] mu: update to 1.4

---
 srcpkgs/mu/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 5f371677881..9633fe543ee 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,17 +1,16 @@
 # Template file for 'mu'
 pkgname=mu
-reverts="1.3.1_1"
-version=1.2
-revision=2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config emacs texinfo"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
-homepage="http://www.djcbsoftware.nl/code/mu/"
+homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
-checksum=75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
+checksum=65b8a2429acac9a7465c03f654d5ad9ed1266c1c8a95ecba2c3d664548ab9328
 
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am

Re: mu: update to 1.4

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616103547

Comment:
`xbps-src check` segfault.

Re: mu: update to 1.4

[emacsomancer]

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

New comment by emacsomancer on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616168998

Comment:
> `xbps-src check` segfault.

This is odd, because while

`xbps-src check` does produce one failure:
```

make[1]: Entering directory '/builddir/mu-1.4/lib'
make  check-recursive
make[2]: Entering directory '/builddir/mu-1.4/lib'
Making check in utils
make[3]: Entering directory '/builddir/mu-1.4/lib/utils'
make  check-TESTS
make[3]: Leaving directory '/builddir/mu-1.4/lib/utils'
make[2]: Leaving directory '/builddir/mu-1.4/lib'
make[1]: Leaving directory '/builddir/mu-1.4/lib'
Making check in m4
make[1]: Entering directory '/builddir/mu-1.4/m4'
make[1]: Nothing to be done for 'check'.
make[1]: Leaving directory '/builddir/mu-1.4/m4'
Making check in man
make[1]: Entering directory '/builddir/mu-1.4/man'
make[1]: Nothing to be done for 'check'.
make[1]: Leaving directory '/builddir/mu-1.4/man'
Making check in lib
make[1]: Entering directory '/builddir/mu-1.4/lib'
make  check-recursive
make[2]: Entering directory '/builddir/mu-1.4/lib'
Making check in utils
make[3]: Entering directory '/builddir/mu-1.4/lib/utils'
make  check-TESTS
make[4]: Entering directory '/builddir/mu-1.4/lib/utils'
make[5]: Entering directory '/builddir/mu-1.4/lib/utils'
PASS: test-mu-util
../../build-aux/test-driver: line 107: 20588 Aborted                 "$@" > $log_file 2>&1
FAIL: test-mu-utils
PASS: test-mu-str
PASS: test-sexp-parser
lsPASS: test-command-parser
============================================================================
Testsuite summary for mu 1.4
============================================================================
# TOTAL: 5
# PASS:  4
# SKIP:  0
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0
============================================================================
```

Building it by hand on Void and running `make check` passes everything:

```
....
make[5]: Entering directory '/home/slade/Documents/sourcecode/mu/lib/utils'
PASS: test-mu-util
PASS: test-mu-utils
PASS: test-mu-str
PASS: test-sexp-parser
PASS: test-command-parser
============================================================================
Testsuite summary for mu 1.4
============================================================================
# TOTAL: 5
# PASS:  5
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
...
```

The package itself seems to work fine as far as I can tell - I've been using it extensively since yesterday.  Maybe related to https://github.com/djcb/mu/issues/1187 ?

Re: mu: update to 1.4

[emacsomancer]

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

New comment by emacsomancer on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616168998

Comment:
> `xbps-src check` segfault.

This is odd, because while

`xbps-src check` does produce one failure:
```
.....
make[1]: Entering directory '/builddir/mu-1.4/lib'
make  check-recursive
make[2]: Entering directory '/builddir/mu-1.4/lib'
Making check in utils
make[3]: Entering directory '/builddir/mu-1.4/lib/utils'
make  check-TESTS
make[3]: Leaving directory '/builddir/mu-1.4/lib/utils'
make[2]: Leaving directory '/builddir/mu-1.4/lib'
make[1]: Leaving directory '/builddir/mu-1.4/lib'
Making check in m4
make[1]: Entering directory '/builddir/mu-1.4/m4'
make[1]: Nothing to be done for 'check'.
make[1]: Leaving directory '/builddir/mu-1.4/m4'
Making check in man
make[1]: Entering directory '/builddir/mu-1.4/man'
make[1]: Nothing to be done for 'check'.
make[1]: Leaving directory '/builddir/mu-1.4/man'
Making check in lib
make[1]: Entering directory '/builddir/mu-1.4/lib'
make  check-recursive
make[2]: Entering directory '/builddir/mu-1.4/lib'
Making check in utils
make[3]: Entering directory '/builddir/mu-1.4/lib/utils'
make  check-TESTS
make[4]: Entering directory '/builddir/mu-1.4/lib/utils'
make[5]: Entering directory '/builddir/mu-1.4/lib/utils'
PASS: test-mu-util
../../build-aux/test-driver: line 107: 20588 Aborted                 "$@" > $log_file 2>&1
FAIL: test-mu-utils
PASS: test-mu-str
PASS: test-sexp-parser
PASS: test-command-parser
============================================================================
Testsuite summary for mu 1.4
============================================================================
# TOTAL: 5
# PASS:  4
# SKIP:  0
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0
============================================================================
.....
```

Building it by hand on Void and running `make check` passes everything:

```
....
make[5]: Entering directory '/home/slade/Documents/sourcecode/mu/lib/utils'
PASS: test-mu-util
PASS: test-mu-utils
PASS: test-mu-str
PASS: test-sexp-parser
PASS: test-command-parser
============================================================================
Testsuite summary for mu 1.4
============================================================================
# TOTAL: 5
# PASS:  5
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
...
```

The package itself seems to work fine as far as I can tell - I've been using it extensively since yesterday.  Maybe related to https://github.com/djcb/mu/issues/1187 ?

Re: [PR PATCH] [Updated] mu: update to 1.4

[emacsomancer]

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

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

https://github.com/emacsomancer/void-packages mu1.4
https://github.com/void-linux/void-packages/pull/21131

mu: update to 1.4


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mu1.4-21131.patch --]
[-- Type: text/x-diff, Size: 1273 bytes --]

From 4f8783e0ec8aa3196ea2b11d8ccf5d4ac16a7ead Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 18 Apr 2020 13:24:21 -0600
Subject: [PATCH] mu: update to 1.4

- bump to minor fixed version
---
 srcpkgs/mu/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 5f371677881..51f733e03cf 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,17 +1,16 @@
 # Template file for 'mu'
 pkgname=mu
-reverts="1.3.1_1"
-version=1.2
-revision=2
+version=1.4.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config emacs texinfo"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
-homepage="http://www.djcbsoftware.nl/code/mu/"
+homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
-checksum=75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
+checksum=66ae911abb3d7269514fada08e7a13ad61a205e10209055c41df2f9d17568274
 
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am

Re: mu: update to 1.4

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616545010

Comment:
It's caused by missing of `tzdata`,

This diff can fix it.
Please check if this is correct.

```diff
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 51f733e03c..fa04f9d6d3 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -3,8 +3,9 @@ pkgname=mu
 version=1.4.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config emacs texinfo"
+hostmakedepends="automake libtool pkg-config emacs texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+checkdepends="tzdata"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
```

Re: mu: update to 1.4

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616556679

Comment:
Here is my final diff on top of your change,
this will enable cross-build for mu and fix the check,
I think you're the maintainer of this package, if it's ok to you,
I'll push this version out.

```diff
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 51f733e03c..bbe37e1138 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -3,8 +3,9 @@ pkgname=mu
 version=1.4.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config emacs texinfo"
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+checkdepends="tzdata"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
@@ -12,12 +13,23 @@ homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
 checksum=66ae911abb3d7269514fada08e7a13ad61a205e10209055c41df2f9d17568274
 
+if [ ! "$CROSS_BUILD" ]; then
+	subpackages="mu4e"
+	hostmakedepends+=" emacs"
+else
+	# force subpackages to non-empty value,
+	# else xbps-src will generate it.
+	subpackages=" "
+	configure_args+=" --disable-mu4e"
+fi
+
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
 	autoreconf -fi
 }
 
 mu4e_package() {
+	archs=noarch
 	short_desc+=" - Emacs frontend"
 	depends="${sourcepkg}>=${version}_${revision} emacs"
 	pkg_install() {
```

Re: mu: update to 1.4

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616556679

Comment:
Here is my final diff on top of your change,
this will enable cross-build for mu and fix the check,
I think you're the maintainer of this package, if it's ok to you,
I'll push this version out.

```diff
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 51f733e03c..78668f59da 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -3,8 +3,9 @@ pkgname=mu
 version=1.4.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config emacs texinfo"
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+checkdepends="tzdata"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
@@ -12,16 +13,28 @@ homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
 checksum=66ae911abb3d7269514fada08e7a13ad61a205e10209055c41df2f9d17568274
 
+if [ ! "$CROSS_BUILD" ]; then
+	subpackages="mu4e"
+	hostmakedepends+=" emacs"
+else
+	# force subpackages to non-empty value,
+	# else xbps-src will generate it.
+	subpackages=" "
+	configure_args+=" --disable-mu4e"
+fi
+
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
 	autoreconf -fi
 }
 
 mu4e_package() {
+	archs=noarch
 	short_desc+=" - Emacs frontend"
 	depends="${sourcepkg}>=${version}_${revision} emacs"
 	pkg_install() {
 		vmove usr/share/emacs
 		vmove usr/share/info
+		vmove usr/share/doc/mu/mu4e*
 	}
 }
```

Re: mu: update to 1.4

[emacsomancer]

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

New comment by emacsomancer on void-packages repository

https://github.com/void-linux/void-packages/pull/21131#issuecomment-616624459

Comment:
@sgn Yes, I think this looks ready to push.

Re: [PR PATCH] [Closed]: mu: update to 1.4

[sgn]

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

There's a closed pull request on the void-packages repository

mu: update to 1.4
https://github.com/void-linux/void-packages/pull/21131

Description:

[PR PATCH] mu: update to 1.4.

[ralsei]

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

There is a new pull request by ralsei against master on the void-packages repository

https://github.com/ralsei/void-packages mu-1.4
https://github.com/void-linux/void-packages/pull/21124

mu: update to 1.4.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mu-1.4-21124.patch --]
[-- Type: text/x-diff, Size: 1309 bytes --]

From e23a97a0d76119010d52a569376ed7a73fc05c97 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sat, 18 Apr 2020 11:21:17 -0400
Subject: [PATCH] mu: update to 1.4.

---
 srcpkgs/mu/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 5f371677881..62ecc64e3f3 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,8 +1,7 @@
 # Template file for 'mu'
 pkgname=mu
-reverts="1.3.1_1"
-version=1.2
-revision=2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config emacs texinfo"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
@@ -10,8 +9,8 @@ short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-forma
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
-checksum=75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
+distfiles="https://github.com/djcb/mu/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=fe3af9362e41f8f215ed8ceb60fed5832aed427ebf366eea17d73e4b6146c6ab
 
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am