From 8f68b081a801dd414743562f81cf8d27ffc92c2e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Aug 2019 22:34:11 +0200 Subject: [PATCH] emacs: add termux-service script, put socket in $PREFIX/var/run Start with sv up emacsd --- packages/emacs/build.sh | 14 +++++++++++++- .../emacs/lisp-server.el.patch.beforehostbuild | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index 6eb2516c2..72deb7768 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=26.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2" TERMUX_PKG_BREAKS="emacs-dev" TERMUX_PKG_REPLACES="emacs-dev" +TERMUX_PKG_CONFFILES="var/service/emacsd/run var/service/emacsd/log/run" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-autodepend --with-gif=no @@ -83,6 +84,17 @@ termux_step_post_configure() { termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/site-init.el $TERMUX_PREFIX/share/emacs/${TERMUX_PKG_VERSION}/lisp/emacs-lisp/ + + # Setup emacs --daemon service script + mkdir -p $TERMUX_PREFIX/var/service + cd $TERMUX_PREFIX/var/service + mkdir -p emacsd/log + echo "#!$TERMUX_PREFIX/bin/sh" > emacsd/run + echo 'exec emacs --fg-daemon 2>&1' >> emacsd/run + chmod +x emacsd/run + touch emacsd/down + + ln -sf $TERMUX_PREFIX/share/termux-services/svlogger emacsd/log/run } termux_step_create_debscripts() { diff --git a/packages/emacs/lisp-server.el.patch.beforehostbuild b/packages/emacs/lisp-server.el.patch.beforehostbuild index b57f6d608..162852a16 100644 --- a/packages/emacs/lisp-server.el.patch.beforehostbuild +++ b/packages/emacs/lisp-server.el.patch.beforehostbuild @@ -6,7 +6,7 @@ diff -u -r ../emacs-25.0.92/lisp/server.el ./lisp/server.el (defvar server-socket-dir (and (featurep 'make-network-process '(:family local)) - (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))) -+ (format "%s/emacs%d" (or (getenv "TMPDIR") "@TERMUX_PREFIX@/tmp") (user-uid))) ++ (format "%s/emacs%d" "@TERMUX_PREFIX@/var/run" (user-uid))) "The directory in which to place the server socket. If local sockets are not supported, this is nil.")