Browse Source

emacs: Update from 26.1 to 26.2

android-5
Fredrik Fornwall 6 years ago
parent
commit
3fa67e85c3
  1. 5
      packages/emacs/build.sh
  2. 16
      packages/emacs/hunspell_1.7.0.patch.beforehostbuild
  3. 29
      packages/emacs/lisp-textmodes-ispell.el.patch.beforehostbuild

5
packages/emacs/build.sh

@ -1,9 +1,8 @@
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.1 TERMUX_PKG_VERSION=26.2
TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
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_DEPENDS="ncurses, gnutls, libxml2" TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

16
packages/emacs/hunspell_1.7.0.patch.beforehostbuild

@ -1,16 +0,0 @@
--- ../ispell.el.orig 2018-12-14 21:01:30.659947236 +0100
+++ ./lisp/textmodes/ispell.el 2018-12-14 21:05:18.803278916 +0100
@@ -1111,7 +1111,12 @@
null-device
t
nil
- "-D")
+ ;; Hunspell 1.7.0 (and later?) won't
+ ;; show LOADED DICTIONARY unless
+ ;; there's at least one file argument
+ ;; on the command line. So we feed
+ ;; it with the null device.
+ "-D" null-device)
(buffer-string))
"[\n\r]+"
t))

29
packages/emacs/lisp-textmodes-ispell.el.patch.beforehostbuild

@ -1,6 +1,7 @@
--- ../ispell.el.orig 2018-12-14 21:01:30.659947236 +0100 diff -u -r ../emacs-26.2/lisp/textmodes/ispell.el ./lisp/textmodes/ispell.el
+++ ./lisp/textmodes/ispell.el 2018-12-14 21:05:18.803278916 +0100 --- ../emacs-26.2/lisp/textmodes/ispell.el 2019-02-20 13:44:42.000000000 +0000
@@ -213,13 +213,13 @@ +++ ./lisp/textmodes/ispell.el 2019-04-14 18:15:07.894909566 +0000
@@ -215,14 +215,14 @@
:group 'ispell) :group 'ispell)
(defcustom ispell-alternate-dictionary (defcustom ispell-alternate-dictionary
@ -11,24 +12,26 @@
- ((file-readable-p "/usr/share/dict/words") "/usr/share/dict/words") - ((file-readable-p "/usr/share/dict/words") "/usr/share/dict/words")
- ((file-readable-p "/usr/share/lib/dict/words") - ((file-readable-p "/usr/share/lib/dict/words")
- "/usr/share/lib/dict/words") - "/usr/share/lib/dict/words")
+ (cond ((file-readable-p "@TERMUX_PREFIX@/dict/web2") "@TERMUX_PREFIX@/dict/web2") - ((file-readable-p "/sys/dict") "/sys/dict"))
+ ((file-readable-p "@TERMUX_PREFIX@/share/dict/web2") "@TERMUX_PREFIX@/share/dict/web2") + (cond ((file-readable-p "@TERMUX_PREFIX@/dict/web2") "/usr/dict/web2")
+ ((file-readable-p "@TERMUX_PREFIX@/dict/words") "@TERMUX_PREFIX@/dict/words") + ((file-readable-p "@TERMUX_PREFIX@/share/dict/web2") "/usr/share/dict/web2")
+ ((file-readable-p "@TERMUX_PREFIX@/lib/dict/words") "@TERMUX_PREFIX@/lib/dict/words") + ((file-readable-p "@TERMUX_PREFIX@/dict/words") "/usr/dict/words")
+ ((file-readable-p "@TERMUX_PREFIX@/share/dict/words") "@TERMUX_PREFIX@/share/dict/words") + ((file-readable-p "@TERMUX_PREFIX@/lib/dict/words") "/usr/lib/dict/words")
+ ((file-readable-p "@TERMUX_PREFIX@/share/dict/words") "/usr/share/dict/words")
+ ((file-readable-p "@TERMUX_PREFIX@/share/lib/dict/words") + ((file-readable-p "@TERMUX_PREFIX@/share/lib/dict/words")
+ "@TERMUX_PREFIX@/share/lib/dict/words") + "@TERMUX_PREFIX@/share/lib/dict/words")
((file-readable-p "/sys/dict") "/sys/dict")) + ((file-readable-p "@TERMUX_PREFIX@/sys/dict") "@TERMUX_PREFIX@/sys/dict"))
"Alternate plain word-list dictionary for spelling help." "Alternate plain word-list dictionary for spelling help."
:type '(choice file (const :tag "None" nil)) :type '(choice file (const :tag "None" nil))
@@ -265,8 +265,8 @@ :group 'ispell)
@@ -266,9 +266,7 @@
:group 'ispell)
(defcustom ispell-look-command (defcustom ispell-look-command
(cond ((file-exists-p "/bin/look") "/bin/look") - (cond ((file-exists-p "/bin/look") "/bin/look")
- ((file-exists-p "/usr/local/bin/look") "/usr/local/bin/look") - ((file-exists-p "/usr/local/bin/look") "/usr/local/bin/look")
- ((file-exists-p "/usr/bin/look") "/usr/bin/look") - ((file-exists-p "/usr/bin/look") "/usr/bin/look")
+ ((file-exists-p "@TERMUX_PREFIX@/local/bin/look") "@TERMUX_PREFIX@/local/bin/look") + (cond ((file-exists-p "@TERMUX_PREFIX@/bin/look") "@TERMUX_PREFIX@/bin/look")
+ ((file-exists-p "@TERMUX_PREFIX@/bin/look") "@TERMUX_PREFIX@/bin/look")
(t "look")) (t "look"))
"Name of the look command for search processes. "Name of the look command for search processes.
This must be an absolute file name." This must be an absolute file name."

Loading…
Cancel
Save