commit: ffbc6936ccd6975302dc044ecbd9a0847a203cfb
parent 61bd830a6797e0115eb23269788bdcd333a8eb9c
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 12 Feb 2020 16:55:30 -0800
ncurses: Update to 6.2
Diffstat:
8 files changed, 109 insertions(+), 30 deletions(-)
diff --git a/pkg/ncurses/.gitignore b/pkg/ncurses/.gitignore
@@ -1,3 +1,3 @@
-/ncurses-6.1.tar.gz
+/ncurses-6.2.tar.gz
/src
/tools.ninja
diff --git a/pkg/ncurses/gen.lua b/pkg/ncurses/gen.lua
@@ -16,11 +16,16 @@ sub('tools.ninja', function()
exe('make_hash', {'ncurses/tinfo/make_hash.c'}, {'$gendir/headers', '$outdir/hashsize.h'})
end)
+local caps = {
+ '$srcdir/include/Caps',
+ '$srcdir/include/Caps-ncurses',
+}
+
build('sed', '$outdir/curses.head', {'$srcdir/include/curses.h.in', '|', '$dir/subst.sed'}, {
expr='-f $dir/subst.sed',
})
rule('mkkeydefs', '{ cat $outdir/curses.head && sh $srcdir/include/MKkey_defs.sh $in && cat $srcdir/include/curses.wide $srcdir/include/curses.tail; } >$out')
-build('mkkeydefs', '$outdir/include/curses.h', {'$srcdir/include/Caps', '|',
+build('mkkeydefs', '$outdir/include/curses.h', {caps, '|',
'$outdir/curses.head',
'$srcdir/include/curses.wide',
'$srcdir/include/curses.tail',
@@ -28,10 +33,10 @@ build('mkkeydefs', '$outdir/include/curses.h', {'$srcdir/include/Caps', '|',
})
rule('mkhashsize', 'sh $srcdir/include/MKhashsize.sh $in >$out')
-build('mkhashsize', '$outdir/hashsize.h', {'$srcdir/include/Caps', '|', '$srcdir/include/MKhashsize.sh'})
+build('mkhashsize', '$outdir/hashsize.h', {caps, '|', '$srcdir/include/MKhashsize.sh'})
rule('mkkeyslist', 'sh $srcdir/ncurses/tinfo/MKkeys_list.sh $in | LC_ALL=C sort >$out')
-build('mkkeyslist', '$outdir/keys.list', {'$srcdir/include/Caps', '|', '$srcdir/ncurses/tinfo/MKkeys_list.sh'})
+build('mkkeyslist', '$outdir/keys.list', {caps, '|', '$srcdir/ncurses/tinfo/MKkeys_list.sh'})
rule('mkkeys', '$outdir/make_keys $in >$out')
build('mkkeys', '$outdir/init_keytry.h', {'$outdir/keys.list', '|', '$outdir/make_keys'})
@@ -40,7 +45,7 @@ rule('mkdefs', 'sh $srcdir/include/MKncurses_def.sh $in >$out')
build('mkdefs', '$outdir/ncurses_def.h', {'$srcdir/include/ncurses_defs', '|', '$srcdir/include/MKncurses_def.sh'})
rule('mkparam', '$srcdir/include/MKparametrized.sh $in >$out')
-build('mkparam', '$outdir/parametrized.h', {'$srcdir/include/Caps', '|', '$srcdir/include/MKparametrized.sh'})
+build('mkparam', '$outdir/parametrized.h', {caps, '|', '$srcdir/include/MKparametrized.sh'})
build('sed', '$outdir/MKterm.h.awk', {'$srcdir/include/MKterm.h.awk.in', '|', '$dir/subst.sed'}, {
expr='-f $dir/subst.sed',
@@ -53,27 +58,33 @@ for _, f in ipairs{'ncurses_dll.h', 'termcap.h', 'unctrl.h'} do
end
rule('mkterm', 'awk -f $outdir/MKterm.h.awk $in >$out')
-build('mkterm', '$outdir/include/term.h', {'$srcdir/include/Caps', '|', '$outdir/MKterm.h.awk'})
+build('mkterm', '$outdir/include/term.h', {caps, '|', '$outdir/MKterm.h.awk'})
-build('awk', '$outdir/codes.c', {'$srcdir/include/Caps', '|', '$srcdir/ncurses/tinfo/MKcodes.awk'}, {
+build('awk', '$outdir/codes.c', {caps, '|', '$srcdir/ncurses/tinfo/MKcodes.awk'}, {
expr='-f $srcdir/ncurses/tinfo/MKcodes.awk bigstrings=1',
})
-rule('mkcaptab', '(cd $outdir && $$OLDPWD/$srcdir/ncurses/tinfo/MKcaptab.sh awk 1 $$OLDPWD/$srcdir/ncurses/tinfo/MKcaptab.awk $$OLDPWD/$in) >$out')
-build('mkcaptab', '$outdir/comp_captab.c', {'$srcdir/include/Caps', '|',
+rule('mkcaptab', 'MAKE_HASH=$outdir/make_hash sh -e $srcdir/ncurses/tinfo/MKcaptab.sh awk 1 $srcdir/ncurses/tinfo/MKcaptab.awk $in >$out')
+build('mkcaptab', '$outdir/comp_captab.c', {caps, '|',
'$outdir/make_hash',
'$srcdir/tinfo/MKcaptab.awk',
'$srcdir/tinfo/MKcaptab.sh',
})
-rule('mkfallback', 'sh $srcdir/ncurses/tinfo/MKfallback.sh /dev/null /dev/null /dev/null >$out')
+rule('mkuserdefs', 'MAKE_HASH=$outdir/make_hash sh -e $srcdir/ncurses/tinfo/MKuserdefs.sh awk 1 $in >$out')
+build('mkuserdefs', '$outdir/comp_userdefs.c', {caps, '|',
+ '$outdir/make_hash',
+ '$srcdir/tinfo/MKuserdefs.sh',
+})
+
+rule('mkfallback', 'sh $srcdir/ncurses/tinfo/MKfallback.sh /dev/null /dev/null /dev/null /dev/null >$out')
build('mkfallback', '$outdir/fallback.c', {'|', '$srcdir/ncurses/tinfo/MKfallback.sh'})
build('awk', '$outdir/lib_keyname.c', '$outdir/keys.list', {
expr='-f $srcdir/ncurses/base/MKkeyname.awk bigstrings=1',
})
-build('awk', '$outdir/names.c', {'$srcdir/include/Caps', '|', '$srcdir/ncurses/tinfo/MKnames.awk'}, {
+build('awk', '$outdir/names.c', {caps, '|', '$srcdir/ncurses/tinfo/MKnames.awk'}, {
expr='-f $srcdir/ncurses/tinfo/MKnames.awk bigstrings=1',
})
diff --git a/pkg/ncurses/ncurses_cfg.h b/pkg/ncurses/ncurses_cfg.h
@@ -1,8 +1,8 @@
#ifndef NC_CONFIG_H
#define NC_CONFIG_H
#define PACKAGE "ncurses"
-#define NCURSES_VERSION "6.0"
-#define NCURSES_PATCHDATE 20180127
+#define NCURSES_VERSION "6.2"
+#define NCURSES_PATCHDATE 20200212
#define SYSTEM_NAME "linux-musl"
#if 0
#include <stdlib.h>
@@ -41,6 +41,17 @@
#define NEED_WCHAR_H 1
#define HAVE_FSEEKO 1
#define RGB_PATH "/usr/lib64/X11/rgb.txt"
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#define SIZEOF_SIGNED_CHAR 1
#define NCURSES_EXT_FUNCS 1
#define HAVE_ASSUME_DEFAULT_COLORS 1
#define HAVE_CURSES_VERSION 1
@@ -61,17 +72,6 @@
#define HAVE_RESET_COLOR_PAIRS 1
#define NCURSES_EXT_PUTWIN 1
#define NCURSES_NO_PADDING 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define SIZEOF_SIGNED_CHAR 1
#define USE_SIGWINCH 1
#define NCURSES_WRAP_PREFIX "_nc_"
#define USE_ASSUMED_COLOR 1
@@ -105,6 +105,11 @@
#define HAVE_UNISTD_H 1
#define HAVE_GETOPT_H 1
#define HAVE_GETOPT_HEADER 1
+#define DECL_ENVIRON 1
+#define HAVE_ENVIRON 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_STRDUP 1
#define HAVE_SYS_TIME_SELECT 1
#define SIG_ATOMIC_T volatile sig_atomic_t
#define HAVE_GETCWD 1
@@ -112,6 +117,7 @@
#define HAVE_GETEUID 1
#define HAVE_GETOPT 1
#define HAVE_ISSETUGID 1
+#define HAVE_LOCALECONV 1
#define HAVE_POLL 1
#define HAVE_PUTENV 1
#define HAVE_REMOVE 1
@@ -123,8 +129,8 @@
#define HAVE_SIGACTION 1
#define HAVE_STRDUP 1
#define HAVE_STRSTR 1
+#define HAVE_SYSCONF 1
#define HAVE_TCGETPGRP 1
-#define HAVE_TDESTROY 1
#define HAVE_TIMES 1
#define HAVE_TSEARCH 1
#define HAVE_VSNPRINTF 1
@@ -132,11 +138,11 @@
#define HAVE_NANOSLEEP 1
#define HAVE_TERMIOS_H 1
#define HAVE_UNISTD_H 1
+#define HAVE_SYS_IOCTL_H 1
#define HAVE_TCGETATTR 1
#define HAVE_VSSCANF 1
#define HAVE_UNISTD_H 1
#define HAVE_MKSTEMP 1
-#define SETVBUF_REVERSED 1
#define HAVE_SIZECHANGE 1
#define HAVE_WORKING_POLL 1
#define HAVE_VA_COPY 1
@@ -145,6 +151,7 @@
#define HAVE_VFORK 1
#define HAVE_WORKING_VFORK 1
#define HAVE_WORKING_FORK 1
+#define USE_FOPEN_BIN_R 1
#define USE_OPENPTY_HEADER <pty.h>
#define USE_XTERM_PTY 1
#define HAVE_TYPEINFO 1
@@ -160,7 +167,7 @@
#define HAVE_FORM_H 1
#define HAVE_LIBFORM 1
#define NCURSES_PATHSEP ':'
-#define NCURSES_VERSION_STRING "6.1.20180127"
+#define NCURSES_VERSION_STRING "6.2.20200212"
#define NCURSES_OSPEED_COMPAT 1
#define HAVE_CURSES_DATA_BOOLNAMES 1
#include <ncurses_def.h>
diff --git a/pkg/ncurses/patch/0001-Allow-overriding-make_hash-path.patch b/pkg/ncurses/patch/0001-Allow-overriding-make_hash-path.patch
@@ -0,0 +1,60 @@
+From bfa058b1e3414994e663e02d553f23e4f72eef19 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 12 Feb 2020 16:54:30 -0800
+Subject: [PATCH] Allow overriding make_hash path
+
+---
+ ncurses/tinfo/MKcaptab.sh | 6 ++++--
+ ncurses/tinfo/MKuserdefs.sh | 5 ++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh
+index c800023..52e436e 100755
+--- a/ncurses/tinfo/MKcaptab.sh
++++ b/ncurses/tinfo/MKcaptab.sh
+@@ -29,6 +29,8 @@
+ ##############################################################################
+ # $Id: MKcaptab.sh,v 1.19 2020/02/02 23:34:34 tom Exp $
+
++: ${MAKE_HASH:=./make_hash}
++
+ if test $# != 0
+ then
+ AWK="$1"; shift 1
+@@ -71,8 +73,8 @@ cat <<'EOF'
+ /* *INDENT-OFF* */
+ EOF
+
+-cat "$@" |./make_hash 1 info $OPT1
+-cat "$@" |./make_hash 3 cap $OPT1
++cat "$@" |$MAKE_HASH 1 info $OPT1
++cat "$@" |$MAKE_HASH 3 cap $OPT1
+
+ cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias
+
+diff --git a/ncurses/tinfo/MKuserdefs.sh b/ncurses/tinfo/MKuserdefs.sh
+index 109dd64..97d8803 100755
+--- a/ncurses/tinfo/MKuserdefs.sh
++++ b/ncurses/tinfo/MKuserdefs.sh
+@@ -27,6 +27,9 @@
+ # authorization. #
+ ##############################################################################
+ # $Id: MKuserdefs.sh,v 1.10 2020/02/02 23:34:34 tom Exp $
++
++: ${MAKE_HASH:=./make_hash}
++
+ AWK=${1-awk}; shift 1
+ OPT1=${1-0}; shift 1
+
+@@ -51,7 +54,7 @@ cat <<'EOF'
+ #if NCURSES_XNAMES
+ EOF
+
+-cat "$@" | ./make_hash 1 user $OPT1
++cat "$@" | $MAKE_HASH 1 user $OPT1
+
+ cat <<EOF
+
+--
+2.25.0
+
diff --git a/pkg/ncurses/sha256 b/pkg/ncurses/sha256
@@ -1 +1 @@
-aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz
+30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d ncurses-6.2.tar.gz
diff --git a/pkg/ncurses/sources.lua b/pkg/ncurses/sources.lua
@@ -124,6 +124,7 @@ return {
'$outdir/comp_captab.c',
'ncurses/tinfo/comp_error.c',
'ncurses/tinfo/comp_hash.c',
+ '$outdir/comp_userdefs.c',
'ncurses/tinfo/db_iterator.c',
'ncurses/tinfo/doalloc.c',
'ncurses/tinfo/entries.c',
diff --git a/pkg/ncurses/url b/pkg/ncurses/url
@@ -1 +1 @@
-url = "http://invisible-mirror.net/archives/ncurses/ncurses-6.1.tar.gz"
+url = "http://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz"
diff --git a/pkg/ncurses/ver b/pkg/ncurses/ver
@@ -1 +1 @@
-6.1 r2
+6.2 r0
