Hi ports@,

This is an update for mail/mu to the latest version on the 1.12 branch.  Why
1.12 and not 1.14 (which is the latest) ?  Because this one already has the fix
that was annoying me (missing lexical-binding cookie message) and I did not want
to dig into the port right now.  I'll probably try the update to 1.14 at some
point though.

Anyway, this works for me on amd64.  I had to do a complete reindex (mu index
--reindex).  If not, the counters on the main buffer were not updating
correctly.

I bumped SHARED_LIBS because I saw on the changelog they are making changes to
that area, but not entirely sure if this is needed.

Our makeinfo is too old and fails during the build, so I had to add an ugly
patch.

cc maintainer.

ok to commit ?

diff --git mail/mu/Makefile mail/mu/Makefile
index cc75c086b1e..07eeb8410e2 100644
--- mail/mu/Makefile
+++ mail/mu/Makefile
@@ -5,7 +5,7 @@ GUILE_V =       3.0
 FLAVORS =      guile
 FLAVOR ?=
 
-SHARED_LIBS =  guile-mu        0.1
+SHARED_LIBS =  guile-mu        0.2
 
 CATEGORIES =   mail
 HOMEPAGE =     https://www.djcbsoftware.nl/code/mu/
@@ -18,7 +18,7 @@ PERMIT_PACKAGE =      Yes
 WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
 WANTLIB += m xapian
 
-DIST_TUPLE =   github djcb mu v1.12.7 .
+DIST_TUPLE =   github djcb mu v1.12.15 .
 
 EXTRACT_SUFX = .tar.xz
 
diff --git mail/mu/distinfo mail/mu/distinfo
index 5b04da1124c..edfa28e47e6 100644
--- mail/mu/distinfo
+++ mail/mu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (djcb-mu-v1.12.7.tar.gz) = khLPD507Y0LVoK6kCj1bURb+TaGYcZzMqx+Ppmg72LQ=
-SIZE (djcb-mu-v1.12.7.tar.gz) = 966457
+SHA256 (djcb-mu-v1.12.15.tar.gz) = DBhAuoPLwMbu87EgytUphh0BCKAfK9wurBfAvxXrwqE=
+SIZE (djcb-mu-v1.12.15.tar.gz) = 1039899
diff --git mail/mu/patches/patch-mu4e_mu4e_texi 
mail/mu/patches/patch-mu4e_mu4e_texi
new file mode 100644
index 00000000000..7eedc289df9
--- /dev/null
+++ mail/mu/patches/patch-mu4e_mu4e_texi
@@ -0,0 +1,17 @@
+makeinfo(1) in base is too old and fails when generating the section
+navigation
+
+Index: mu4e/mu4e.texi
+--- mu4e/mu4e.texi.orig
++++ mu4e/mu4e.texi
+@@ -2575,6 +2575,10 @@ later what this something should be; see below
+ which remove the mark from the currently selected message(s) or all
+ @end itemize
+ 
++@menu
++* Applying and clearing labels::
++@end menu
++
+ @node Applying and clearing labels
+ @subsection Applying and clearing labels
+ @cindex labels
diff --git mail/mu/patches/patch-mu_mu-cmd-server_cc 
mail/mu/patches/patch-mu_mu-cmd-server_cc
index 0d2050a65f3..21d83e4a793 100644
--- mail/mu/patches/patch-mu_mu-cmd-server_cc
+++ mail/mu/patches/patch-mu_mu-cmd-server_cc
@@ -3,12 +3,12 @@
 Index: mu/mu-cmd-server.cc
 --- mu/mu-cmd-server.cc.orig
 +++ mu/mu-cmd-server.cc
-@@ -120,7 +120,7 @@ Mu::mu_cmd_server(const Mu::Options& opts) try {
-                  opts.debug ? "yes" : "no",
-                  have_readline() ? "yes" : "no");
- 
+@@ -111,7 +111,7 @@ report_error(const Mu::Error& err) noexcept
+ static void
+ maybe_setup_readline(const Mu::Options& opts)
+ {
 -      tty = ::isatty(::fileno(stdout));
 +      tty = ::isatty(fileno(stdout));
-       const auto eval = std::string{opts.server.commands ? "(help :full t)" : 
opts.server.eval};
-       if (!eval.empty()) {
-               server.invoke(eval);
+ 
+       // Note, the readline stuff is inactive unless on a tty.
+       const auto histpath{opts.runtime_path(RuntimePath::Cache) + "/history"};
diff --git mail/mu/patches/patch-mu_mu-options_cc 
mail/mu/patches/patch-mu_mu-options_cc
index 7c5df7eb41b..39cc2917fc0 100644
--- mail/mu/patches/patch-mu_mu-options_cc
+++ mail/mu/patches/patch-mu_mu-options_cc
@@ -2,7 +2,7 @@
 Index: mu/mu-options.cc
 --- mu/mu-options.cc.orig
 +++ mu/mu-options.cc
-@@ -747,8 +747,8 @@ bool
+@@ -861,8 +861,8 @@ bool
  Options::default_no_color()
  {
        static const auto no_color =
diff --git mail/mu/pkg/PLIST mail/mu/pkg/PLIST
index 0d605eccfc8..92657b97166 100644
--- mail/mu/pkg/PLIST
+++ mail/mu/pkg/PLIST
@@ -8,9 +8,11 @@
 @man man/man1/mu-index.1
 @man man/man1/mu-info.1
 @man man/man1/mu-init.1
+@man man/man1/mu-labels.1
 @man man/man1/mu-mkdir.1
 @man man/man1/mu-move.1
 @man man/man1/mu-remove.1
+@man man/man1/mu-scm.1
 @man man/man1/mu-server.1
 @man man/man1/mu-verify.1
 @man man/man1/mu-view.1
@@ -20,6 +22,7 @@
 @man man/man7/mu-query.7
 %%guile%%
 share/doc/mu/
+share/doc/mu/IDEAS.org
 share/doc/mu/NEWS.org
 share/doc/mu/mu4e-about.org
 share/emacs/
@@ -39,6 +42,8 @@ share/emacs/site-lisp/mu4e/mu4e-context.el
 share/emacs/site-lisp/mu4e/mu4e-context.elc
 share/emacs/site-lisp/mu4e/mu4e-contrib.el
 share/emacs/site-lisp/mu4e/mu4e-contrib.elc
+share/emacs/site-lisp/mu4e/mu4e-dbus.el
+share/emacs/site-lisp/mu4e/mu4e-dbus.elc
 share/emacs/site-lisp/mu4e/mu4e-draft.el
 share/emacs/site-lisp/mu4e/mu4e-draft.elc
 share/emacs/site-lisp/mu4e/mu4e-folders.el
@@ -49,6 +54,8 @@ share/emacs/site-lisp/mu4e/mu4e-helpers.el
 share/emacs/site-lisp/mu4e/mu4e-helpers.elc
 share/emacs/site-lisp/mu4e/mu4e-icalendar.el
 share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
+share/emacs/site-lisp/mu4e/mu4e-labels.el
+share/emacs/site-lisp/mu4e/mu4e-labels.elc
 share/emacs/site-lisp/mu4e/mu4e-lists.el
 share/emacs/site-lisp/mu4e/mu4e-lists.elc
 share/emacs/site-lisp/mu4e/mu4e-main.el
@@ -78,6 +85,8 @@ share/emacs/site-lisp/mu4e/mu4e-speedbar.el
 share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
 share/emacs/site-lisp/mu4e/mu4e-thread.el
 share/emacs/site-lisp/mu4e/mu4e-thread.elc
+share/emacs/site-lisp/mu4e/mu4e-transient.el
+share/emacs/site-lisp/mu4e/mu4e-transient.elc
 share/emacs/site-lisp/mu4e/mu4e-update.el
 share/emacs/site-lisp/mu4e/mu4e-update.elc
 share/emacs/site-lisp/mu4e/mu4e-vars.el
-- 
Paco Esteban
0x5818130B8A6DBC03

Reply via email to