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

emacs-x: update to 26.2

Browse Source
This commit is contained in:
Leonid Pliushch 2019-05-19 02:56:55 +03:00 committed by Yaksh Bariya
parent 0733901f9e
commit 2af17ae633
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x11-packages/emacs-x/build.sh
View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more (with X11 support)"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=26.1
TERMUX_PKG_REVISION=5
TERMUX_PKG_VERSION=26.2
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
TERMUX_PKG_SHA256=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk3, libandroid-shmem, libcairo-x, libgnutls, libice, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxpm, libxrandr, libxrender, littlecms, ncurses, pango-x, zlib"
TERMUX_PKG_CONFLICTS="emacs"
TERMUX_PKG_REPLACES="emacs"
@ -22,8 +21,7 @@ share/emacs/${TERMUX_PKG_VERSION}/etc/refcards
share/info/dir
share/man/man1/ctags.1
share/man/man1/ctags.1.gz
share/man/man1/grep-changelog.1.gz
"
share/man/man1/grep-changelog.1.gz"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-autodepend
@ -37,7 +35,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--without-gsettings
--with-x
"
# Ensure use of system malloc:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
@ -68,6 +65,10 @@ termux_step_post_extract_package() {
export CANNOT_DUMP=yes
}
termux_step_pre_configure() {
export LIBS="-landroid-shmem"
}
termux_step_host_build() {
# Build a bootstrap-emacs binary to be used in termux_step_post_configure.
local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native
@ -78,10 +79,6 @@ termux_step_host_build() {
make -j $TERMUX_MAKE_PROCESSES
}
termux_step_pre_configure() {
export LIBS="-landroid-shmem"
}
termux_step_post_configure() {
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

37
x11-packages/emacs-x/lisp-textmodes-ispell.el.patch.beforehostbuild Normal file
View File

@ -0,0 +1,37 @@
diff -u -r ../emacs-26.2/lisp/textmodes/ispell.el ./lisp/textmodes/ispell.el
--- ../emacs-26.2/lisp/textmodes/ispell.el 2019-02-20 13:44:42.000000000 +0000
+++ ./lisp/textmodes/ispell.el 2019-04-14 18:15:07.894909566 +0000
@@ -215,14 +215,14 @@
:group 'ispell)
(defcustom ispell-alternate-dictionary
- (cond ((file-readable-p "/usr/dict/web2") "/usr/dict/web2")
- ((file-readable-p "/usr/share/dict/web2") "/usr/share/dict/web2")
- ((file-readable-p "/usr/dict/words") "/usr/dict/words")
- ((file-readable-p "/usr/lib/dict/words") "/usr/lib/dict/words")
- ((file-readable-p "/usr/share/dict/words") "/usr/share/dict/words")
- ((file-readable-p "/usr/share/lib/dict/words")
- "/usr/share/lib/dict/words")
- ((file-readable-p "/sys/dict") "/sys/dict"))
+ (cond ((file-readable-p "@TERMUX_PREFIX@/dict/web2") "/usr/dict/web2")
+ ((file-readable-p "@TERMUX_PREFIX@/share/dict/web2") "/usr/share/dict/web2")
+ ((file-readable-p "@TERMUX_PREFIX@/dict/words") "/usr/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")
+ "@TERMUX_PREFIX@/share/lib/dict/words")
+ ((file-readable-p "@TERMUX_PREFIX@/sys/dict") "@TERMUX_PREFIX@/sys/dict"))
"Alternate plain word-list dictionary for spelling help."
:type '(choice file (const :tag "None" nil))
:group 'ispell)
@@ -266,9 +266,7 @@
:group 'ispell)
(defcustom ispell-look-command
- (cond ((file-exists-p "/bin/look") "/bin/look")
- ((file-exists-p "/usr/local/bin/look") "/usr/local/bin/look")
- ((file-exists-p "/usr/bin/look") "/usr/bin/look")
+ (cond ((file-exists-p "@TERMUX_PREFIX@/bin/look") "@TERMUX_PREFIX@/bin/look")
(t "look"))
"Name of the look command for search processes.
This must be an absolute file name."