From 8f68b081a801dd414743562f81cf8d27ffc92c2e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Aug 2019 22:34:11 +0200 Subject: [PATCH 1/3] 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 6eb2516c2c..72deb77687 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 b57f6d608d..162852a165 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.") From 3bc687b67cf4a49ea50acc83e8d490126839527a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Aug 2019 22:37:25 +0200 Subject: [PATCH 2/3] tmux: put socket in $PREFIX/var/run instead of $TMPDIR See https://github.com/termux/termux-packages/issues/4206 --- packages/tmux/build.sh | 2 +- packages/tmux/socket-path.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 packages/tmux/socket-path.patch diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh index fab47090ee..dfe1b90745 100644 --- a/packages/tmux/build.sh +++ b/packages/tmux/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD" # Link against libandroid-support for wcwidth(), see https://github.com/termux/termux-packages/issues/224 TERMUX_PKG_DEPENDS="ncurses, libevent, libandroid-support, libandroid-glob" TERMUX_PKG_VERSION=2.9a -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static" diff --git a/packages/tmux/socket-path.patch b/packages/tmux/socket-path.patch new file mode 100644 index 0000000000..934e79969f --- /dev/null +++ b/packages/tmux/socket-path.patch @@ -0,0 +1,11 @@ +--- ../tmux.c.orig 2019-08-24 20:23:15.576000965 +0200 ++++ ./tmux.c 2019-08-24 22:11:56.316981911 +0200 +@@ -121,7 +121,7 @@ + if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') + xasprintf(&base, "%s/tmux-%ld", s, (long)uid); + else +- xasprintf(&base, "%s/tmux-%ld", _PATH_TMP, (long)uid); ++ xasprintf(&base, "%s/tmux-%ld", "@TERMUX_PREFIX@/var/run", (long)uid); + if (realpath(base, resolved) == NULL && + strlcpy(resolved, base, sizeof resolved) >= sizeof resolved) { + errno = ERANGE; From 1314ee19f99bf2515ddd36448a8eabf9493fa47b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Aug 2019 22:42:12 +0200 Subject: [PATCH 3/3] mpd: use $PREFIX/var/run instead of $TMPDIR See https://github.com/termux/termux-packages/issues/4206 --- packages/mpd/build.sh | 2 +- packages/mpd/doc-mpdconf.example.patch | 4 ++-- packages/mpd/src-fs-io-FileOutputStream.hxx.patch | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 5c71605f95..342090a981 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.21.13 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0c71ff34aa4def30cd931977cbfe3deb6ec815a726b8c5343f1b8e5707136ebf TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib" diff --git a/packages/mpd/doc-mpdconf.example.patch b/packages/mpd/doc-mpdconf.example.patch index 6a2960ffa7..f336133b2e 100644 --- a/packages/mpd/doc-mpdconf.example.patch +++ b/packages/mpd/doc-mpdconf.example.patch @@ -69,7 +69,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example # # And for Unix Socket -#bind_to_address "~/.mpd/socket" -+bind_to_address "@TERMUX_PREFIX@/tmp/mpd.socket" ++bind_to_address "@TERMUX_PREFIX@/var/run/mpd.socket" # # This setting is the TCP port that is desired for the daemon to get assigned -# to. @@ -191,7 +191,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example +audio_output { + type "fifo" + name "ncmpcpp visualizer" -+ path "~/../usr/tmp/mpd.fifo" ++ path "@TERMUX_PREFIX@/var/run/mpd.fifo" + format "44100:16:2" + enabled "no" +} diff --git a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch b/packages/mpd/src-fs-io-FileOutputStream.hxx.patch index e3d5e59455..114d19555c 100644 --- a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch +++ b/packages/mpd/src-fs-io-FileOutputStream.hxx.patch @@ -1,7 +1,6 @@ -diff -u -r ../MPD-0.21.3/src/fs/io/FileOutputStream.hxx ./src/fs/io/FileOutputStream.hxx ---- ../MPD-0.21.3/src/fs/io/FileOutputStream.hxx 2018-11-16 12:27:58.000000000 +0000 -+++ ./src/fs/io/FileOutputStream.hxx 2018-12-31 01:08:58.577798371 +0000 -@@ -46,7 +46,7 @@ +--- ../FileOutputStream.hxx.orig 2019-08-24 20:56:41.969642005 +0200 ++++ ./src/fs/io/FileOutputStream.hxx 2019-08-12 21:47:53.854420002 +0200 +@@ -45,7 +45,7 @@ #include #endif