zile: Bump to 2.6.2

This commit is contained in:
Tee KOBAYASHI 2022-11-14 13:12:00 +09:00 committed by xtkoba
parent 506e2c276d
commit 0478ca52ae
5 changed files with 8 additions and 125 deletions

View File

@ -2,19 +2,22 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/zile/
TERMUX_PKG_DESCRIPTION="Lightweight clone of the Emacs text editor"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.4.15
TERMUX_PKG_VERSION=2.6.2
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/zile/zile-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e
TERMUX_PKG_DEPENDS="libgc, ncurses"
TERMUX_PKG_SHA256=77eb7daff3c98bdc88daa1ac040dccca72b81dc32fc3166e079dd7a63e42c741
TERMUX_PKG_DEPENDS="glib, libgee, ncurses"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_header_spawn_h=no
gl_cv_have_weak=no
"
termux_step_post_configure() {
# zile uses help2man to build the zile.1 man page, which would require
# a host build. To avoid that just copy a pre-built man page.
cp $TERMUX_PKG_BUILDER_DIR/zile.1 $TERMUX_PKG_BUILDDIR/doc/zile.1
# a host build.
sed 's|@docdir@|$PREFIX/share/doc/zile|g' \
$TERMUX_PKG_SRCDIR/doc/zile.1.in \
> $TERMUX_PKG_BUILDDIR/doc/zile.1
touch -d "next hour" $TERMUX_PKG_BUILDDIR/doc/zile.1*
}

View File

@ -1,12 +0,0 @@
diff -uNr zile-2.4.14/configure zile-2.4.14.mod/configure
--- zile-2.4.14/configure 2017-10-06 17:28:11.000000000 +0300
+++ zile-2.4.14.mod/configure 2019-08-16 18:37:49.584471922 +0300
@@ -13977,7 +13977,7 @@
if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
+#$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
LIBTHREAD=
LTLIBTHREAD=

View File

@ -1,12 +0,0 @@
diff -uNr zile-2.4.15/lib/vasnprintf.c zile-2.4.15.mod/lib/vasnprintf.c
--- zile-2.4.15/lib/vasnprintf.c 2020-10-03 20:49:03.000000000 +0000
+++ zile-2.4.15.mod/lib/vasnprintf.c 2020-11-22 20:55:13.810138494 +0000
@@ -4874,7 +4874,7 @@
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
&& !defined __UCLIBC__) \
|| (defined __APPLE__ && defined __MACH__) \
- || (defined _WIN32 && ! defined __CYGWIN__))
+ || (defined _WIN32 && ! defined __CYGWIN__) || defined(__ANDROID__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';

View File

@ -1,37 +0,0 @@
Fixes compilation on 64-bit Android which has removed getdtablesize.
diff -u -r ../m4-1.4.17/lib/spawn_faction_addclose.c ./lib/spawn_faction_addclose.c
--- ../m4-1.4.17/lib/spawn_faction_addclose.c 2013-09-22 02:15:20.000000000 -0400
+++ ./lib/spawn_faction_addclose.c 2016-01-03 20:37:44.870178045 -0500
@@ -37,7 +37,7 @@
int fd)
#undef posix_spawn_file_actions_addclose
{
- int maxfd = __sysconf (_SC_OPEN_MAX);
+ int maxfd = sysconf (_SC_OPEN_MAX);
/* Test for the validity of the file descriptor. */
if (fd < 0 || fd >= maxfd)
diff -u -r ../m4-1.4.17/lib/spawn_faction_adddup2.c ./lib/spawn_faction_adddup2.c
--- ../m4-1.4.17/lib/spawn_faction_adddup2.c 2013-09-22 02:15:20.000000000 -0400
+++ ./lib/spawn_faction_adddup2.c 2016-01-03 20:38:11.981753903 -0500
@@ -37,7 +37,7 @@
int fd, int newfd)
#undef posix_spawn_file_actions_adddup2
{
- int maxfd = __sysconf (_SC_OPEN_MAX);
+ int maxfd = sysconf (_SC_OPEN_MAX);
/* Test for the validity of the file descriptor. */
if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd)
diff -u -r ../m4-1.4.17/lib/spawn_faction_addopen.c ./lib/spawn_faction_addopen.c
--- ../m4-1.4.17/lib/spawn_faction_addopen.c 2013-09-22 02:15:20.000000000 -0400
+++ ./lib/spawn_faction_addopen.c 2016-01-03 20:38:21.341607440 -0500
@@ -38,7 +38,7 @@
mode_t mode)
#undef posix_spawn_file_actions_addopen
{
- int maxfd = __sysconf (_SC_OPEN_MAX);
+ int maxfd = sysconf (_SC_OPEN_MAX);
/* Test for the validity of the file descriptor. */
if (fd < 0 || fd >= maxfd)

View File

@ -1,59 +0,0 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.45.1.
.TH ZILE "1" "April 2014" "Zile 2.4.11" "User Commands"
.SH NAME
Zile \- Zile Is Lossy Emacs
.SH SYNOPSIS
.B zile
[\fI\,OPTION-OR-FILENAME\/\fR]...
.SH DESCRIPTION
Zile is a lightweight Emacs clone that provides a subset of Emacs's
functionality suitable for basic editing.
.PP
Run Zile, the lightweight Emacs clone.
.PP
Initialization options:
.TP
\fB\-\-no\-init\-file\fR, \fB\-q\fR
do not load ~/.zile
.TP
\fB\-\-funcall\fR, \fB\-f\fR FUNC
call Zile Lisp function FUNC with no arguments
.TP
\fB\-\-load\fR, \fB\-l\fR FILE
load Zile Lisp FILE using the load function
.TP
\fB\-\-help\fR
display this help message and exit
.TP
\fB\-\-version\fR
display version information and exit
.PP
Action options:
.TP
FILE
visit FILE using find\-file
.TP
+LINE FILE
visit FILE using find\-file, then go to line LINE
.PP
Exit status is 0 if OK, 1 if it cannot start up, for example because
of an invalid command-line argument, and 2 if it crashes or runs out
of memory.
.SH FILES
~/.zile \(em user's Zile init file
.PP
$PREFIX/share/zile/dotzile.sample \(em which contains some useful
code for the init file.
.SH AUTHOR
Zile was written by Sandro Sigala, David A. Capello and Reuben Thomas.
The Lisp interpreter is based on code by Scott Lawrence.
.SH "REPORTING BUGS"
Report bugs to bug\-zile@gnu.org.
.SH COPYRIGHT
Copyright \(co 2014 Free Software Foundation, Inc.
GNU Zile comes with ABSOLUTELY NO WARRANTY.
You may redistribute copies of Zile
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
.SH "SEE ALSO"
.BR emacs (1)