diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index eae250f34..cc05227de 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" -TERMUX_PKG_VERSION=25.3 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b +TERMUX_PKG_VERSION=26.1 +TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2" # "undefined reference to `__muloti4": diff --git a/packages/emacs/lisp-loadup.el.patch.beforehostbuild b/packages/emacs/lisp-loadup.el.patch.beforehostbuild deleted file mode 100644 index 7bd70e529..000000000 --- a/packages/emacs/lisp-loadup.el.patch.beforehostbuild +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el ---- ../emacs-25.0.92/lisp/loadup.el 2016-03-02 05:21:42.000000000 -0500 -+++ ./lisp/loadup.el 2016-03-31 18:41:25.609790054 -0400 -@@ -69,7 +73,8 @@ - - ;; Prevent build-time PATH getting stored in the binary. - ;; Mainly cosmetic, but helpful for Guix. (Bug#20330) --(setq exec-path nil) -+;; Termux patch: Keep exec-path when running undumped: -+;; (setq exec-path nil) - - (if (eq t purify-flag) - ;; Hash consing saved around 11% of pure space in my tests. diff --git a/packages/emacs/lisp-net-tramp.el.patch.beforehostbuild b/packages/emacs/lisp-net-tramp.el.patch.beforehostbuild index 522e8931f..f24d195fe 100644 --- a/packages/emacs/lisp-net-tramp.el.patch.beforehostbuild +++ b/packages/emacs/lisp-net-tramp.el.patch.beforehostbuild @@ -1,12 +1,12 @@ -diff -u -r ../emacs-25.0.95/lisp/net/tramp.el ./lisp/net/tramp.el ---- ../emacs-25.0.95/lisp/net/tramp.el 2016-05-17 12:16:28.000000000 -0400 -+++ ./lisp/net/tramp.el 2016-08-21 09:48:00.190856327 -0400 -@@ -156,7 +156,7 @@ +diff -u -r ../emacs-26.1/lisp/net/tramp.el ./lisp/net/tramp.el +--- ../emacs-26.1/lisp/net/tramp.el 2018-04-23 14:17:48.000000000 +0000 ++++ ./lisp/net/tramp.el 2018-05-29 09:26:34.017326913 +0000 +@@ -127,7 +127,7 @@ + :require 'tramp) + (defcustom tramp-encoding-shell - (if (memq system-type '(windows-nt)) - (getenv "COMSPEC") -- "/bin/sh") -+ "@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. 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 diff --git a/packages/emacs/lisp-term.el.patch.beforehostbuild b/packages/emacs/lisp-term.el.patch.beforehostbuild index e025384b9..0058f6dd1 100644 --- a/packages/emacs/lisp-term.el.patch.beforehostbuild +++ b/packages/emacs/lisp-term.el.patch.beforehostbuild @@ -1,16 +1,7 @@ -diff -u -r ../emacs-25.0.92/lisp/term.el ./lisp/term.el ---- ../emacs-25.0.92/lisp/term.el 2016-03-02 05:21:42.000000000 -0500 -+++ ./lisp/term.el 2016-03-25 22:01:42.366218150 -0400 -@@ -1346,7 +1346,7 @@ - (or explicit-shell-file-name - (getenv "ESHELL") - (getenv "SHELL") -- "/bin/sh")))) -+ "@TERMUX_PREFIX@/bin/sh")))) - (set-buffer (make-term "terminal" program)) - (term-mode) - (term-char-mode) -@@ -1466,7 +1466,7 @@ +diff -u -r ../emacs-26.1/lisp/term.el ./lisp/term.el +--- ../emacs-26.1/lisp/term.el 2018-05-25 08:53:30.000000000 +0000 ++++ ./lisp/term.el 2018-05-29 09:28:08.472262228 +0000 +@@ -1552,7 +1552,7 @@ ;; do the decoding by hand on the parts that are made of chars. (coding-system-for-read 'binary)) (apply 'start-process name buffer @@ -19,12 +10,3 @@ diff -u -r ../emacs-25.0.92/lisp/term.el ./lisp/term.el (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\ if [ $1 = .. ]; then shift; fi; exec \"$@\"" term-height term-width) -@@ -4108,7 +4108,7 @@ - (or explicit-shell-file-name - (getenv "ESHELL") - (getenv "SHELL") -- "/bin/sh")))) -+ "@TERMUX_PREFIX@/bin/sh")))) - - ;; Pick the name of the new buffer. - (setq term-ansi-buffer-name diff --git a/packages/emacs/no_assign_stderr.patch b/packages/emacs/no_assign_stderr.patch deleted file mode 100644 index 359d2a19b..000000000 --- a/packages/emacs/no_assign_stderr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../emacs-24.3/src/print.c ./src/print.c ---- ../emacs-24.3/src/print.c 2013-01-01 21:37:17.000000000 +0100 -+++ ./src/print.c 2014-02-19 03:24:04.000000000 +0100 -@@ -733,7 +733,7 @@ - print_output_debug_flag = x; - } - --#if defined (GNU_LINUX) -+#if defined (GNU_LINUX) && !defined (__ANDROID__) - - /* This functionality is not vitally important in general, so we rely on - non-portable ability to use stderr as lvalue. */