Update for Zile to 2.4.15.

Keeping jca@'s patch for vasnprintf from jca@
This commit is contained in:
gonzalo 2020-12-09 10:24:57 +00:00
parent ca0718d024
commit 2deeee1e8e
5 changed files with 17 additions and 16 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.51 2020/10/05 23:04:15 jca Exp $
# $OpenBSD: Makefile,v 1.52 2020/12/09 10:24:57 gonzalo Exp $
COMMENT= lightweight Emacs clone
DISTNAME= zile-2.4.14
DISTNAME= zile-2.4.15
CATEGORIES= editors
HOMEPAGE= https://www.gnu.org/software/zile/
REVISION= 1
MAINTAINER= Gonzalo L. R. <gonzalo@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (zile-2.4.14.tar.gz) = enh0J5XKMkgPK6tpf9XjKGGNmZfW9BfPGxTp2prya3Q=
SIZE (zile-2.4.14.tar.gz) = 1385314
SHA256 (zile-2.4.15.tar.gz) = OcMAo094w3umd5PPdGhZNaFVaOFCN6Omb9qPz0DjA14=
SIZE (zile-2.4.15.tar.gz) = 1490611

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
$OpenBSD: patch-lib_vasnprintf_c,v 1.3 2020/12/09 10:24:57 gonzalo Exp $
Don't use printf %n.
https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
@ -6,14 +6,14 @@ https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c
Index: lib/vasnprintf.c
--- lib/vasnprintf.c.orig
+++ lib/vasnprintf.c
@@ -4869,10 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
@@ -4871,10 +4871,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
#endif
*fbp = dp->conversion;
#if USE_SNPRINTF
-# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
- && !defined __UCLIBC__) \
- || (defined __APPLE__ && defined __MACH__) \
- || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- || (defined _WIN32 && ! defined __CYGWIN__))
+# if 0
fbp[1] = '%';
fbp[2] = 'n';

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_funcs_c,v 1.1 2014/03/19 15:29:50 bcallah Exp $
--- src/funcs.c.orig Mon Mar 17 22:44:15 2014
+++ src/funcs.c Mon Mar 17 22:44:48 2014
@@ -1118,14 +1118,11 @@ END_DEFUN
$OpenBSD: patch-src_funcs_c,v 1.2 2020/12/09 10:24:57 gonzalo Exp $
Index: src/funcs.c
--- src/funcs.c.orig
+++ src/funcs.c
@@ -1115,14 +1115,11 @@ END_DEFUN
/* The `start' and `end' arguments are fake, hence their string type,
so they can be ignored, hence the pragma (FIXME: work out how to
apply just to `start' and `end'). */

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_minibuf_c,v 1.1 2014/03/19 15:29:50 bcallah Exp $
--- src/minibuf.c.orig Mon Mar 17 22:48:04 2014
+++ src/minibuf.c Mon Mar 17 22:48:13 2014
@@ -287,10 +287,7 @@ minibuf_vread_completion (const char *fmt, const char
$OpenBSD: patch-src_minibuf_c,v 1.2 2020/12/09 10:24:57 gonzalo Exp $
Index: src/minibuf.c
--- src/minibuf.c.orig
+++ src/minibuf.c
@@ -280,10 +280,7 @@ minibuf_vread_completion (const char *fmt, const char
}
else
{