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

emacs: update to 27.1

Browse Source
This commit is contained in:
Henrik Grimler 2019-12-04 07:30:39 +01:00
parent 2dc4371044
commit 66756303e1
12 changed files with 90 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/emacs/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/ 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=27.1
TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://ftp.gnu.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=4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
TERMUX_PKG_SHA256=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2" TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
TERMUX_PKG_BREAKS="emacs-dev" TERMUX_PKG_BREAKS="emacs-dev"
TERMUX_PKG_REPLACES="emacs-dev" TERMUX_PKG_REPLACES="emacs-dev"
@ -89,16 +88,19 @@ termux_step_host_build() {
local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native
mkdir -p $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION mkdir -p $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION
ln -s $TERMUX_PKG_SRCDIR/lisp $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION/lisp ln -s $TERMUX_PKG_SRCDIR/lisp $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION/lisp
( cd $TERMUX_PKG_SRCDIR; ./autogen.sh )
$TERMUX_PKG_SRCDIR/configure --prefix=$NATIVE_PREFIX --without-all --with-x-toolkit=no $TERMUX_PKG_SRCDIR/configure --prefix=$NATIVE_PREFIX --without-all --without-x
make -j $TERMUX_MAKE_PROCESSES make -j $TERMUX_MAKE_PROCESSES
} }
termux_step_post_configure() { termux_step_post_configure() {
cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs
cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-fingerprint $TERMUX_PKG_BUILDDIR/lib-src/make-fingerprint
# Update timestamps so that the binaries does not get rebuilt: # Update timestamps so that the binaries does not get rebuilt:
touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs \
$TERMUX_PKG_BUILDDIR/lib-src/make-docfile \
$TERMUX_PKG_BUILDDIR/lib-src/make-fingerprint
} }
termux_step_post_make_install() { termux_step_post_make_install() {

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

@ -1,18 +1,20 @@
--- ../emacsclient.c.orig 2019-08-29 20:08:48.840624090 +0200 --- ./lib-src/emacsclient.c.orig 2020-07-29 23:40:41.000000000 +0200
+++ ./lib-src/emacsclient.c 2019-08-29 20:13:37.425382182 +0200 +++ ./lib-src/emacsclient.c 2020-09-14 21:36:04.883963456 +0200
@@ -1289,11 +1289,12 @@ @@ -1411,7 +1411,7 @@
} tmpdirlen = min (n - 1, socknamesize);
else # endif
#endif if (tmpdirlen < 0)
- tmpdir = "/tmp"; - tmpdirlen = snprintf (sockname, socknamesize, "/tmp");
+ tmpdir = "@TERMUX_PREFIX@/tmp"; + tmpdirlen = snprintf (sockname, socknamesize, "@TERMUX_PREFIX@/tmp");
} }
+ /* Use $PREFIX/var/run instead of $TMPDIR in termux. */ socknamelen = local_sockname (sockname, socknamesize, tmpdirlen,
socket_name_storage = uid, server_name);
- xmalloc (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE); @@ -1495,7 +1495,7 @@
- char *z = stpcpy (socket_name_storage, tmpdir); uintmax_t id = uid;
+ xmalloc (strlen ("@TERMUX_PREFIX@/var/run") + strlen (server_name) + EXTRA_SPACE); char sockdirname[socknamesize];
+ char *z = stpcpy (socket_name_storage, "@TERMUX_PREFIX@/var/run"); int sockdirnamelen = snprintf (sockdirname, sizeof sockdirname,
z += sprintf (z, "/emacs%ld/", uid); - "/run/user/%"PRIuMAX, id);
strcpy (z, server_name); + "@TERMUX_PREFIX/var@/run/user/%"PRIuMAX, id);
local_socket_name = socket_name_storage; if (0 <= sockdirnamelen && sockdirnamelen < sizeof sockdirname
&& faccessat (AT_FDCWD, sockdirname, X_OK, AT_EACCESS) == 0)
message

7
packages/emacs/lisp-cus-start.el.patch.beforehostbuild
View File

@ -1,7 +1,6 @@
diff -u -r ../emacs-25.0.92/lisp/cus-start.el ./lisp/cus-start.el --- ./lisp/cus-start.el.orig 2020-07-27 23:21:49.000000000 +0200
--- ../emacs-25.0.92/lisp/cus-start.el 2016-03-02 05:21:42.000000000 -0500 +++ ./lisp/cus-start.el 2020-09-14 21:34:59.583435440 +0200
+++ ./lisp/cus-start.el 2016-04-06 18:16:00.007272810 -0400 @@ -290,7 +290,7 @@
@@ -277,7 +277,7 @@
"/tmp")) "/tmp"))
(t (t
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")

7
packages/emacs/lisp-loadup.el-2.patch.beforehostbuild
View File

@ -1,7 +1,6 @@
diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el --- ./lisp/loadup.el.orig 2020-07-27 23:21:49.000000000 +0200
--- ../emacs-25.0.92/lisp/loadup.el 2016-09-06 09:49:51.838175278 +0300 +++ ./lisp/loadup.el 2020-09-14 21:34:59.586768800 +0200
+++ ./lisp/loadup.el 2016-09-06 09:57:18.694585441 +0300 @@ -423,7 +423,11 @@
@@ -378,7 +378,11 @@
(message "Warning: Change in load-path due to site-init will be \ (message "Warning: Change in load-path due to site-init will be \
lost after dumping"))) lost after dumping")))

17
packages/emacs/lisp-net-tramp.el.patch.beforehostbuild
View File

@ -1,12 +1,11 @@
diff -u -r ../emacs-26.1/lisp/net/tramp.el ./lisp/net/tramp.el --- ./lisp/net/tramp.el.orig 2020-07-29 23:40:41.000000000 +0200
--- ../emacs-26.1/lisp/net/tramp.el 2018-04-23 14:17:48.000000000 +0000 +++ ./lisp/net/tramp.el 2020-09-14 21:34:59.593435521 +0200
+++ ./lisp/net/tramp.el 2018-05-29 09:26:34.017326913 +0000 @@ -133,7 +133,7 @@
@@ -127,7 +127,7 @@ ;; Suppress `shell-file-name' for w32 systems.
:require 'tramp)
(defcustom tramp-encoding-shell (defcustom tramp-encoding-shell
- (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh") (let (shell-file-name)
+ (or (tramp-compat-funcall 'w32-shell-name) "@TERMUX_PREFIX@/bin/sh") - (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh"))
+ (or (tramp-compat-funcall 'w32-shell-name) "@TERMUX_PREFIX@/bin/sh"))
"Use this program for encoding and decoding commands on the local host. "Use this program for encoding and decoding commands on the local host.
This shell is used to execute the encoding and decoding command on the This shell is used to execute the encoding and decoding command on the
local host, so if you want to use `~' in those commands, you should local host, so if you want to use \"~\" in those commands, you should

17
packages/emacs/lisp-server.el.patch.beforehostbuild
View File

@ -1,12 +1,11 @@
diff -u -r ../emacs-25.0.92/lisp/server.el ./lisp/server.el --- ./lisp/server.el.orig 2019-11-28 10:49:15.353433913 +0100
--- ../emacs-25.0.92/lisp/server.el 2016-03-02 05:21:42.000000000 -0500 +++ ./lisp/server.el 2019-11-28 10:50:18.741175439 +0100
+++ ./lisp/server.el 2016-04-06 17:34:48.134354070 -0400 @@ -277,7 +277,7 @@
@@ -267,7 +267,7 @@ (let ((xdg_runtime_dir (getenv "XDG_RUNTIME_DIR")))
;; does not read the init file. (if xdg_runtime_dir
(defvar server-socket-dir (format "%s/emacs" xdg_runtime_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") "/tmp") (user-uid))) + (format "%s/emacs%d" "@TERMUX_PREFIX@/var/run" (user-uid))))))
+ (format "%s/emacs%d" "@TERMUX_PREFIX@/var/run" (user-uid)))
"The directory in which to place the server socket. "The directory in which to place the server socket.
If local sockets are not supported, this is nil.") If local sockets are not supported, this is nil.")

21
packages/emacs/lisp-subr.el.patch.beforehostbuild
View File

@ -1,21 +0,0 @@
diff -u -r ../emacs-25.0.92/lisp/subr.el ./lisp/subr.el
--- ../emacs-25.0.92/lisp/subr.el 2016-03-02 05:21:42.000000000 -0500
+++ ./lisp/subr.el 2016-03-25 22:03:57.240066240 -0400
@@ -2975,7 +2975,7 @@
(declare (advertised-calling-convention (name buffer command) "23.1"))
(start-file-process
name buffer
- (if (file-remote-p default-directory) "/bin/sh" shell-file-name)
+ (if (file-remote-p default-directory) "@TERMUX_PREFIX@/bin/sh" shell-file-name)
(if (file-remote-p default-directory) "-c" shell-command-switch)
(mapconcat 'identity args " ")))
@@ -3019,7 +3019,7 @@
(declare (advertised-calling-convention
(command &optional infile buffer display) "24.5"))
(process-file
- (if (file-remote-p default-directory) "/bin/sh" shell-file-name)
+ (if (file-remote-p default-directory) "@TERMUX_PREFIX@/bin/sh" shell-file-name)
infile buffer display
(if (file-remote-p default-directory) "-c" shell-command-switch)
(mapconcat 'identity (cons command args) " ")))

13
packages/emacs/lisp-term.el.patch.beforehostbuild
View File

@ -1,10 +1,9 @@
diff -u -r ../emacs-26.1/lisp/term.el ./lisp/term.el --- ./lisp/term.el.orig 2019-11-28 10:52:45.633666279 +0100
--- ../emacs-26.1/lisp/term.el 2018-05-25 08:53:30.000000000 +0000 +++ ./lisp/term.el 2019-11-28 10:53:51.234778668 +0100
+++ ./lisp/term.el 2018-05-29 09:28:08.472262228 +0000 @@ -1558,7 +1558,7 @@
@@ -1552,7 +1552,7 @@ (push (format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
;; do the decoding by hand on the parts that are made of chars. process-environment))
(coding-system-for-read 'binary)) (apply #'start-process name buffer
(apply 'start-process name buffer
- "/bin/sh" "-c" - "/bin/sh" "-c"
+ "@TERMUX_PREFIX@/bin/sh" "-c" + "@TERMUX_PREFIX@/bin/sh" "-c"
(format "stty -nl echo rows %d columns %d sane 2>/dev/null;\ (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\

9
packages/emacs/no_user_fullname.patch
View File

@ -1,7 +1,6 @@
diff -u -r ../emacs-24.3/src/editfns.c ./src/editfns.c --- ./src/editfns.c.orig 2020-07-29 23:40:42.000000000 +0200
--- ../emacs-24.3/src/editfns.c 2013-01-01 21:37:17.000000000 +0100 +++ ./src/editfns.c 2020-09-14 21:36:04.890630177 +0200
+++ ./src/editfns.c 2014-02-19 03:21:55.000000000 +0100 @@ -1250,7 +1250,7 @@
@@ -1304,7 +1304,7 @@
if (!pw) if (!pw)
return Qnil; return Qnil;
@ -9,4 +8,4 @@ diff -u -r ../emacs-24.3/src/editfns.c ./src/editfns.c
+ p = "unknown"; + p = "unknown";
/* Chop off everything after the first comma. */ /* Chop off everything after the first comma. */
q = strchr (p, ','); q = strchr (p, ',');
full = make_string (p, q ? q - p : strlen (p)); full = make_string (p, q ? q - p : strlen (p));

11
packages/emacs/src-callproc.c.patch
View File

@ -1,12 +1,11 @@
diff -u -r ../emacs-25.0.92/src/callproc.c ./src/callproc.c --- ./src/callproc.c.orig 2020-07-29 23:40:42.000000000 +0200
--- ../emacs-25.0.92/src/callproc.c 2016-03-02 05:21:43.000000000 -0500 +++ ./src/callproc.c 2020-09-14 21:36:04.897296897 +0200
+++ ./src/callproc.c 2016-03-25 22:02:38.977310920 -0400 @@ -1621,7 +1621,7 @@
@@ -1619,7 +1619,7 @@
dir_warning ("arch-independent data dir", Vdata_directory); dir_warning ("arch-independent data dir", Vdata_directory);
sh = getenv ("SHELL"); sh = getenv ("SHELL");
- Vshell_file_name = build_string (sh ? sh : "/bin/sh"); - Vshell_file_name = build_string (sh ? sh : "/bin/sh");
+ Vshell_file_name = build_string (sh ? sh : "@TERMUX_PREFIX@/bin/sh"); + Vshell_file_name = build_string (sh ? sh : "@TERMUX_PREFIX@/bin/sh");
#ifdef DOS_NT Lisp_Object gamedir = Qnil;
Vshared_game_score_directory = Qnil; if (PATH_GAME)

35
packages/emacs/src-filelock.c.patch
View File

@ -1,12 +1,25 @@
diff -u -r ../emacs-25.2/src/filelock.c ./src/filelock.c --- ../emacs-27/src/filelock.c 2019-11-28 09:41:28.000000000 +0100
--- ../emacs-25.2/src/filelock.c 2017-02-03 11:25:45.000000000 +0100 +++ ./src/filelock.c 2019-11-28 15:07:18.792543698 +0100
+++ ./src/filelock.c 2017-06-30 23:36:35.331596590 +0200 @@ -63,11 +63,11 @@
@@ -126,14 +126,14 @@ /* A file whose last-modified time is just after the most recent boot.
Define this to be NULL to disable checking for this file. */
#ifndef BOOT_TIME_FILE
-#define BOOT_TIME_FILE "/var/run/random-seed"
+#define BOOT_TIME_FILE "@TERMUX_PREFIX@/var/run/random-seed"
#endif
#if !defined WTMP_FILE && !defined WINDOWSNT
-#define WTMP_FILE "/var/log/wtmp"
+#define WTMP_FILE "@TERMUX_PREFIX@/var/log/wtmp"
#endif
/* Normally use a symbolic link to represent a lock.
@@ -127,14 +127,14 @@
static time_t boot_time; static time_t boot_time;
static bool boot_time_initialized; static bool boot_time_initialized;
-#ifdef BOOT_TIME -#ifdef BOOT_TIME
+#if defined(BOOT_TIME) && !defined(__ANDROID__) +#if defined (BOOT_TIME) && !defined(__ANDROID__)
static void get_boot_time_1 (const char *, bool); static void get_boot_time_1 (const char *, bool);
#endif #endif
@ -18,21 +31,21 @@ diff -u -r ../emacs-25.2/src/filelock.c ./src/filelock.c
int counter; int counter;
#endif #endif
@@ -169,7 +169,7 @@ @@ -170,7 +170,7 @@
} }
} }
-#if defined (BOOT_TIME) -#if defined (BOOT_TIME)
+#if defined (BOOT_TIME) && !defined(__ANDROID__) +#if defined (BOOT_TIME) && !defined(__ANDROID__)
#ifndef CANNOT_DUMP /* The utmp routines maintain static state. Don't touch that state
/* The utmp routines maintain static state. if we are going to dump, since it might not survive dumping. */
Don't touch that state unless we are initialized, if (will_dump_p ())
@@ -237,7 +237,7 @@ @@ -229,7 +229,7 @@
#endif #endif
} }
-#ifdef BOOT_TIME -#ifdef BOOT_TIME
+#if defined(BOOT_TIME) && !defined(__ANDROID__) +#if defined (BOOT_TIME) && !defined(__ANDROID__)
/* Try to get the boot time from wtmp file FILENAME. /* Try to get the boot time from wtmp file FILENAME.
This succeeds if that file contains a reboot record. This succeeds if that file contains a reboot record.

22
packages/emacs/src-keyboard.c.patch
View File

@ -1,22 +0,0 @@
https://github.com/emacs-mirror/emacs/commit/18b235941109ab9e7a405cbe950886c97e897e11
diff --git a/src/keyboard.c b/src/keyboard.c
index 57757cf2112..f32b1560133 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8916,7 +8916,6 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
ptrdiff_t keys_start;
Lisp_Object current_binding = Qnil;
- Lisp_Object first_event = Qnil;
/* Index of the first key that has no binding.
It is useless to try fkey.start larger than that. */
@@ -9026,6 +9025,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
starting_buffer = current_buffer;
first_unbound = bufsize + 1;
+ Lisp_Object first_event = mock_input > 0 ? keybuf[0] : Qnil;
/* Build our list of keymaps.
If we recognize a function key and replace its escape sequence in