sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

emacs: make emacsclient look for socket in $PREFIX/var/run per default

This commit is contained in:
Henrik Grimler 2019-08-29 20:27:12 +02:00
parent 9f24b24ef1
commit 9b73c472de
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/emacs/build.sh
View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=26.3 TERMUX_PKG_VERSION=26.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485 TERMUX_PKG_SHA256=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2" TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"

16
packages/emacs/lib-src-emacsclient.c.patch
View File

@ -1,12 +1,18 @@
diff -u -r ../emacs-25.0.92/lib-src/emacsclient.c ./lib-src/emacsclient.c --- ../emacsclient.c.orig 2019-08-29 20:08:48.840624090 +0200
--- ../emacs-25.0.92/lib-src/emacsclient.c 2016-03-02 05:21:42.000000000 -0500 +++ ./lib-src/emacsclient.c 2019-08-29 20:13:37.425382182 +0200
+++ ./lib-src/emacsclient.c 2016-04-09 01:28:10.881760020 -0400 @@ -1289,11 +1289,12 @@
@@ -1210,7 +1210,7 @@
} }
else else
#endif #endif
- tmpdir = "/tmp"; - tmpdir = "/tmp";
+ tmpdir = "@TERMUX_PREFIX@/tmp"; + tmpdir = "@TERMUX_PREFIX@/tmp";
} }
+ /* Use $PREFIX/var/run instead of $TMPDIR in termux. */
socket_name_storage = socket_name_storage =
xmalloc (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE); - xmalloc (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE);
- char *z = stpcpy (socket_name_storage, tmpdir);
+ xmalloc (strlen ("@TERMUX_PREFIX@/var/run") + strlen (server_name) + EXTRA_SPACE);
+ char *z = stpcpy (socket_name_storage, "@TERMUX_PREFIX@/var/run");
z += sprintf (z, "/emacs%ld/", uid);
strcpy (z, server_name);
local_socket_name = socket_name_storage;