sdk
/
patches
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
patches/mu-1.8.6.diff

257 lines
9.5 KiB
Diff
Raw Permalink Blame History

Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34
+++ mail/mu/Makefile 29 Jul 2022 05:31:01 -0000
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.11
+V= 1.8.6
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/v${V}/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
@@ -32,15 +32,12 @@ LIB_DEPENDS= databases/xapian-core \
mail/gmime30 \
security/gpgme
-# C++14
+# C++17
COMPILER= base-clang ports-gcc
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= autoreconf
-
-CONFIGURE_ARGS= --disable-gtk \
- --disable-webkit
.if ${FLAVOR} == "guile"
WANTLIB += guile-${GUILE_V} gc ltdl gmp
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- mail/mu/distinfo 16 Jun 2022 15:39:44 -0000 1.20
+++ mail/mu/distinfo 16 Jul 2022 11:53:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.11.tar.xz) = YOqyQNwQjypBn0fWp1wWhBB43NGT8sC7Atzbn/SE7I0=
-SIZE (mu-1.6.11.tar.xz) = 870188
+SHA256 (mu-1.8.6.tar.xz) = rWgHKGVTbDFOfCUfu2XHvwx5CP/MKqAkcg6yr3UpRPE=
+SIZE (mu-1.8.6.tar.xz) = 539684
Index: mail/mu/patches/patch-configure_ac
===================================================================
RCS file: mail/mu/patches/patch-configure_ac
diff -N mail/mu/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-configure_ac 29 Jul 2022 05:32:40 -0000
@@ -0,0 +1,22 @@
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -38,7 +38,6 @@ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+-AC_CHECK_INCLUDES_DEFAULT
+ AC_PROG_EGREP
+
+
+@@ -212,8 +211,8 @@ AS_IF([test "x$enable_guile" != "xno"],[
+ GUILE_PROGS
+ GUILE_FLAGS
+ AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
+- vsnarf=guile-snarf${GUILE_EFFECTIVE_VERSION}
+- AC_CHECK_PROGS(GUILE_SNARF,[${vsnarf} guile-snarf], [no])
++ vsnarf=guile-snarf2.2${GUILE_EFFECTIVE_VERSION}
++ AC_CHECK_PROGS(GUILE_SNARF,[${vsnarf} guile-snarf2.2], [no])
+ guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
+ ])
+ ])
Index: mail/mu/patches/patch-lib_utils_mu-readline_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib_utils_mu-readline_cc
--- mail/mu/patches/patch-lib_utils_mu-readline_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-lib_utils_mu-readline_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: lib/utils/mu-readline.cc
--- lib/utils/mu-readline.cc.orig
+++ lib/utils/mu-readline.cc
-@@ -68,7 +68,7 @@ static size_t max_lines{};
+@@ -74,7 +74,7 @@ Mu::have_readline()
void
- Mu::setup_readline (const std::string& histpath, size_t maxlines)
+ Mu::setup_readline(const std::string& histpath, size_t maxlines)
{
-- is_a_tty = !!::isatty(::fileno(stdout));
-+ is_a_tty = !!::isatty(fileno(stdout));
- hist_path = histpath;
- max_lines = maxlines;
+- is_a_tty = !!::isatty(::fileno(stdout));
++ is_a_tty = !!::isatty(fileno(stdout));
+ hist_path = histpath;
+ max_lines = maxlines;
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===================================================================
RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-lib_utils_mu-utils-format_hh 28 Jun 2022 20:30:21 -0000
@@ -0,0 +1,12 @@
+Index: lib/utils/mu-utils-format.hh
+--- lib/utils/mu-utils-format.hh.orig
++++ lib/utils/mu-utils-format.hh
+@@ -49,7 +49,7 @@ std::string format(const char* frm, ...) __attribute__
+ *
+ * @return a formatted string
+ */
+-std::string vformat(const char* frm, va_list args) __attribute__((format(printf, 1, 0)));
++std::string vformat(const char* frm, __va_list args) __attribute__((format(printf, 1, 0)));
+
+
+ } // namepace Mu
Index: mail/mu/patches/patch-lib_utils_mu-utils_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils_cc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-lib_utils_mu-utils_cc
--- mail/mu/patches/patch-lib_utils_mu-utils_cc 11 Mar 2022 19:34:42 -0000 1.3
+++ mail/mu/patches/patch-lib_utils_mu-utils_cc 28 Jun 2022 20:30:21 -0000
@@ -1,13 +1,14 @@
-Bring vasprintf into scope
-
Index: lib/utils/mu-utils.cc
--- lib/utils/mu-utils.cc.orig
+++ lib/utils/mu-utils.cc
-@@ -18,7 +18,6 @@
+@@ -17,10 +17,7 @@
+ ** 02110-1301, USA.
*/
-
+-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
- #include <time.h>
+ #include <stdexcept>
+-#endif /*_XOPEN_SOURCE*/
+
+ #include <array>
- #define GNU_SOURCE
Index: mail/mu/patches/patch-mu_mu-cmd-server_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-mu_mu-cmd-server_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-mu_mu-cmd-server_cc
--- mail/mu/patches/patch-mu_mu-cmd-server_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-mu_mu-cmd-server_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: mu/mu-cmd-server.cc
--- mu/mu-cmd-server.cc.orig
+++ mu/mu-cmd-server.cc
-@@ -109,7 +109,7 @@ Mu::mu_cmd_server (const MuConfig *opts, GError **err)
- store.metadata().root_maildir.c_str(),
- opts->debug ? "yes" : "no");
+@@ -130,7 +130,7 @@ Mu::mu_cmd_server(const MuConfig* opts) try {
+ opts->debug ? "yes" : "no",
+ have_readline() ? "yes" : "no");
-- tty = ::isatty(::fileno(stdout));
-+ tty = ::isatty(fileno(stdout));
-
- const auto eval = std::string {
- opts->commands ? "(help :full t)" : opts->eval ? opts->eval : ""};
+- tty = ::isatty(::fileno(stdout));
++ tty = ::isatty(fileno(stdout));
+ const auto eval = std::string{opts->commands ? "(help :full t)"
+ : opts->eval ? opts->eval
+ : ""};
Index: mail/mu/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/mail/mu/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- mail/mu/pkg/PLIST 11 Mar 2022 19:34:42 -0000 1.9
+++ mail/mu/pkg/PLIST 28 Jun 2022 20:30:21 -0000
@@ -4,6 +4,7 @@
@man man/man1/mu-cfind.1
@man man/man1/mu-easy.1
@man man/man1/mu-extract.1
+@man man/man1/mu-fields.1
@man man/man1/mu-find.1
@man man/man1/mu-help.1
@man man/man1/mu-index.1
@@ -27,16 +28,26 @@ share/emacs/site-lisp/
share/emacs/site-lisp/mu4e/
share/emacs/site-lisp/mu4e/mu4e-actions.el
share/emacs/site-lisp/mu4e/mu4e-actions.elc
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.el
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc
share/emacs/site-lisp/mu4e/mu4e-compose.el
share/emacs/site-lisp/mu4e/mu4e-compose.elc
+share/emacs/site-lisp/mu4e/mu4e-config.el
+share/emacs/site-lisp/mu4e/mu4e-config.elc
+share/emacs/site-lisp/mu4e/mu4e-contacts.el
+share/emacs/site-lisp/mu4e/mu4e-contacts.elc
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-draft.el
share/emacs/site-lisp/mu4e/mu4e-draft.elc
+share/emacs/site-lisp/mu4e/mu4e-folders.el
+share/emacs/site-lisp/mu4e/mu4e-folders.elc
share/emacs/site-lisp/mu4e/mu4e-headers.el
share/emacs/site-lisp/mu4e/mu4e-headers.elc
+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-lists.el
@@ -47,24 +58,18 @@ share/emacs/site-lisp/mu4e/mu4e-mark.el
share/emacs/site-lisp/mu4e/mu4e-mark.elc
share/emacs/site-lisp/mu4e/mu4e-message.el
share/emacs/site-lisp/mu4e/mu4e-message.elc
-share/emacs/site-lisp/mu4e/mu4e-meta.el
-share/emacs/site-lisp/mu4e/mu4e-meta.elc
share/emacs/site-lisp/mu4e/mu4e-org.el
share/emacs/site-lisp/mu4e/mu4e-org.elc
-share/emacs/site-lisp/mu4e/mu4e-proc.el
-share/emacs/site-lisp/mu4e/mu4e-proc.elc
+share/emacs/site-lisp/mu4e/mu4e-search.el
+share/emacs/site-lisp/mu4e/mu4e-search.elc
+share/emacs/site-lisp/mu4e/mu4e-server.el
+share/emacs/site-lisp/mu4e/mu4e-server.elc
share/emacs/site-lisp/mu4e/mu4e-speedbar.el
share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
-share/emacs/site-lisp/mu4e/mu4e-utils.el
-share/emacs/site-lisp/mu4e/mu4e-utils.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
share/emacs/site-lisp/mu4e/mu4e-vars.elc
-share/emacs/site-lisp/mu4e/mu4e-view-common.el
-share/emacs/site-lisp/mu4e/mu4e-view-common.elc
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.el
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.elc
-share/emacs/site-lisp/mu4e/mu4e-view-old.el
-share/emacs/site-lisp/mu4e/mu4e-view-old.elc
share/emacs/site-lisp/mu4e/mu4e-view.el
share/emacs/site-lisp/mu4e/mu4e-view.elc
share/emacs/site-lisp/mu4e/mu4e.el
Reference in New Issue View Git Blame Copy Permalink