pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mu: temporary fix for server



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Tue Apr 23 21:32:20 2024 -0400
Changeset:	6d6fb6c5283cbae3b2c14c7079c61488a674d36a

Modified Files:
	mu/Makefile
	mu/TODO
	mu/distinfo
Added Files:
	mu/patches/patch-lib_utils_mu-readline.cc

Log Message:
mu: temporary fix for server

technically you're not supposed to use readline with mu4e but this
works and doesn't appear to have any issues.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6d6fb6c5283cbae3b2c14c7079c61488a674d36a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mu/Makefile                               |  3 ++-
 mu/TODO                                   |  1 -
 mu/distinfo                               |  1 +
 mu/patches/patch-lib_utils_mu-readline.cc | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diffs:
diff --git a/mu/Makefile b/mu/Makefile
index ccaca4cc25..3f545ce239 100644
--- a/mu/Makefile
+++ b/mu/Makefile
@@ -15,7 +15,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 MESON_ARGS+=	-Dlispdir=${EMACS_LISPPREFIX}
-MESON_ARGS+=	-Dbuildtype=debug
+MESON_ARGS+=	-Dreadline=enabled
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config autoconf automake ninja
@@ -42,6 +42,7 @@ post-install:
 #.include "../../lang/python/application.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
+.include "../../devel/readline/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/gmime3/buildlink3.mk"
diff --git a/mu/TODO b/mu/TODO
index 54485842c1..2cb5b0fb29 100644
--- a/mu/TODO
+++ b/mu/TODO
@@ -1,4 +1,3 @@
-- `mu server` starts up and immediately quits
 - more testing
 - add guile option back in
 - probably some issues with PLIST
diff --git a/mu/distinfo b/mu/distinfo
index b53472c784..bcc64e0633 100644
--- a/mu/distinfo
+++ b/mu/distinfo
@@ -3,5 +3,6 @@ $NetBSD: distinfo,v 1.2 2014/11/02 18:30:40 thomasklausner Exp $
 BLAKE2s (mu-1.12.3.tar.gz) = bb68bcd5bd4c70ca715edf5aba81e6fe93a425b15dae277d674a5efa41d401c8
 SHA512 (mu-1.12.3.tar.gz) = 018a7abb91dd61f27bb4f6d1ce1b52f762f42383a73fd63f0c42264fe3938530dd232b4315d1f599fa2974938a22ead7d0dc2c188b1e45c8acbc1ce21f287d66
 Size (mu-1.12.3.tar.gz) = 958099 bytes
+SHA1 (patch-lib_utils_mu-readline.cc) = a5da17e0221671b18656565841dd8bfb6d7d02d1
 SHA1 (patch-lib_utils_mu-utils-file.cc) = 3c748d6652b3d141ea40c125fe9fc3363611c84e
 SHA1 (patch-mu_mu-cmd-find.cc) = 1ac5aa68b309a86a47e7284d9ce43b845ceb268a
diff --git a/mu/patches/patch-lib_utils_mu-readline.cc b/mu/patches/patch-lib_utils_mu-readline.cc
new file mode 100644
index 0000000000..91b9491e47
--- /dev/null
+++ b/mu/patches/patch-lib_utils_mu-readline.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- lib/utils/mu-readline.cc.orig	2024-04-24 01:19:02.086438386 +0000
++++ lib/utils/mu-readline.cc
+@@ -73,7 +73,11 @@ Mu::have_readline()
+ void
+ Mu::setup_readline(const std::string& histpath, size_t maxlines)
+ {
++#if defined(__NetBSD__)
++	is_a_tty  = 1;
++#else
+ 	is_a_tty  = !!::isatty(::fileno(stdout));
++#endif
+ 	hist_path = histpath;
+ 	max_lines = maxlines;
+ 


Home | Main Index | Thread Index | Old Index