commit: ae7aa76bbe99826691f4fff9e9828856aa6fd860
parent e18d1d26d29a6e74f07af0adacaff56ec466bb1c
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 2 Feb 2018 00:20:19 -0800
ncurses: Update to 6.1
Diffstat:
9 files changed, 139 insertions(+), 29 deletions(-)
diff --git a/pkg/ncurses/.gitignore b/pkg/ncurses/.gitignore
@@ -1,3 +1,3 @@
-/ncurses-6.0.tar.gz
+/ncurses-6.1.tar.gz
/src
/tools.ninja
diff --git a/pkg/ncurses/README.md b/pkg/ncurses/README.md
@@ -0,0 +1,10 @@
+# ncurses
+
+## config.h
+
+Generated with
+
+ ./configure \
+ --prefix= \
+ --host=x86_64-linux-musl \
+ --enable-widec
diff --git a/pkg/ncurses/gen.lua b/pkg/ncurses/gen.lua
@@ -1,6 +1,5 @@
set('common_cflags', {
'-D NDEBUG',
- '-I include',
'-I $dir',
'-I $outdir',
'-I $outdir/include',
@@ -38,7 +37,7 @@ build('mkkeydefs', '$outdir/include/curses.h', {'$srcdir/include/Caps', '|',
rule('mkhashsize', 'sh $srcdir/include/MKhashsize.sh $in >$out.tmp && mv $out.tmp $out')
build('mkhashsize', '$outdir/hashsize.h', {'$srcdir/include/Caps', '|', '$srcdir/include/MKhashsize.sh'})
-rule('mkkeyslist', 'sh $srcdir/ncurses/tinfo/MKkeys_list.sh $in | sort >$out.tmp && mv $out.tmp $out')
+rule('mkkeyslist', 'sh $srcdir/ncurses/tinfo/MKkeys_list.sh $in | LC_ALL=C sort >$out.tmp && mv $out.tmp $out')
build('mkkeyslist', '$outdir/keys.list', {'$srcdir/include/Caps', '|', '$srcdir/ncurses/tinfo/MKkeys_list.sh'})
rule('mkkeys', '$outdir/make_keys $in >$out.tmp && mv $out.tmp $out')
@@ -116,8 +115,10 @@ pkg.deps = {
lib('libncurses.a', lines('sources.txt'))
file('lib/libncurses.a', '644', '$outdir/libncurses.a')
+cc('progs/transform.c')
+
exe('tic', [[
- progs/(tic.c dump_entry.c tparm_type.c transform.c)
+ progs/(tic.c dump_entry.c tparm_type.c transform.c.o)
ncurses/(
tinfo/(
alloc_entry.c
@@ -134,7 +135,10 @@ exe('tic', [[
]])
file('bin/tic', '755', '$outdir/tic')
-exe('tset', {'progs/tset.c', 'progs/transform.c.o', 'libncurses.a'})
+exe('tset', [[
+ progs/(tset.c reset_cmd.c transform.c.o tty_settings.c)
+ libncurses.a
+]])
file('bin/tset', '755', '$outdir/tset')
sym('bin/reset', 'tset')
diff --git a/pkg/ncurses/ncurses_cfg.h b/pkg/ncurses/ncurses_cfg.h
@@ -1,12 +1,12 @@
#ifndef NC_CONFIG_H
#define NC_CONFIG_H
-
-#include <config-posix.h>
-
#define PACKAGE "ncurses"
#define NCURSES_VERSION "6.0"
-#define NCURSES_PATCHDATE 20150808
+#define NCURSES_PATCHDATE 20180127
#define SYSTEM_NAME "linux-musl"
+#if 0
+#include <stdlib.h>
+#endif
#define HAVE_LONG_FILE_NAMES 1
#define MIXEDCASE_FILENAMES 1
#define TERMINFO_DIRS "/share/terminfo"
@@ -15,11 +15,33 @@
#define PURE_TERMINFO 1
#define USE_HOME_TERMINFO 1
#define USE_ROOT_ENVIRON 1
+#define HAVE_UNISTD_H 1
+#define HAVE_REMOVE 1
+#define HAVE_UNLINK 1
+#define HAVE_LINK 1
+#define HAVE_SYMLINK 1
#define USE_LINKS 1
#define HAVE_LANGINFO_CODESET 1
#define USE_WIDEC_SUPPORT 1
#define NCURSES_WIDECHAR 1
+#define HAVE_WCHAR_H 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_PUTWC 1
+#define HAVE_BTOWC 1
+#define HAVE_WCTOB 1
+#define HAVE_MBTOWC 1
+#define HAVE_WCTOMB 1
+#define HAVE_MBLEN 1
+#define HAVE_MBRLEN 1
+#define HAVE_MBRTOWC 1
+#define HAVE_WCSRTOMBS 1
+#define HAVE_MBSRTOWCS 1
+#define HAVE_WCSTOMBS 1
+#define HAVE_MBSTOWCS 1
#define NEED_WCHAR_H 1
+#define HAVE_FSEEKO 1
+#define RGB_PATH "/usr/lib64/X11/rgb.txt"
+#define NCURSES_EXT_FUNCS 1
#define HAVE_ASSUME_DEFAULT_COLORS 1
#define HAVE_CURSES_VERSION 1
#define HAVE_HAS_KEY 1
@@ -27,20 +49,33 @@
#define HAVE_RESIZE_TERM 1
#define HAVE_TERM_ENTRY_H 1
#define HAVE_USE_DEFAULT_COLORS 1
+#define HAVE_USE_EXTENDED_NAMES 1
#define HAVE_USE_SCREEN 1
#define HAVE_USE_WINDOW 1
#define HAVE_WRESIZE 1
-#define NCURSES_EXT_FUNCS 1
#define NCURSES_SP_FUNCS 1
+#define HAVE_TPUTS_SP 1
#define NCURSES_EXT_COLORS 1
+#define HAVE_ALLOC_PAIR 1
+#define HAVE_INIT_EXTENDED_COLOR 1
+#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
#define USE_HASHMAP 1
-#define NCURSES_WRAP_PREFIX "_nc_"
#define GCC_SCANF 1
#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
#define GCC_PRINTF 1
@@ -48,21 +83,68 @@
#define GCC_UNUSED __attribute__((unused))
#define GCC_NORETURN __attribute__((noreturn))
#define HAVE_NC_ALLOC_H 1
+#define HAVE_GETTIMEOFDAY 1
+#define STDC_HEADERS 1
+#define HAVE_DIRENT_H 1
#define TIME_WITH_SYS_TIME 1
#define HAVE_REGEX_H_FUNCS 1
+#define HAVE_FCNTL_H 1
#define HAVE_GETOPT_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_POLL_H 1
#define HAVE_SYS_IOCTL_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_POLL_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_UNISTD_H 1
#define HAVE_GETOPT_H 1
#define HAVE_GETOPT_HEADER 1
#define HAVE_SYS_TIME_SELECT 1
#define SIG_ATOMIC_T volatile sig_atomic_t
+#define HAVE_GETCWD 1
+#define HAVE_GETEGID 1
+#define HAVE_GETEUID 1
+#define HAVE_GETOPT 1
#define HAVE_ISSETUGID 1
+#define HAVE_POLL 1
+#define HAVE_PUTENV 1
+#define HAVE_REMOVE 1
+#define HAVE_SELECT 1
+#define HAVE_SETBUF 1
#define HAVE_SETBUFFER 1
+#define HAVE_SETENV 1
+#define HAVE_SETVBUF 1
+#define HAVE_SIGACTION 1
+#define HAVE_STRDUP 1
+#define HAVE_STRSTR 1
+#define HAVE_TCGETPGRP 1
+#define HAVE_TDESTROY 1
+#define HAVE_TIMES 1
+#define HAVE_TSEARCH 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_ISASCII 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_TERMIOS_H 1
+#define HAVE_UNISTD_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
+#define HAVE_UNISTD_H 1
+#define HAVE_FORK 1
+#define HAVE_VFORK 1
+#define HAVE_WORKING_VFORK 1
+#define HAVE_WORKING_FORK 1
#define USE_OPENPTY_HEADER <pty.h>
#define USE_XTERM_PTY 1
#define HAVE_TYPEINFO 1
@@ -78,9 +160,17 @@
#define HAVE_FORM_H 1
#define HAVE_LIBFORM 1
#define NCURSES_PATHSEP ':'
-#define NCURSES_VERSION_STRING "6.0.20150808"
+#define NCURSES_VERSION_STRING "6.1.20180127"
#define NCURSES_OSPEED_COMPAT 1
-
+#define HAVE_CURSES_DATA_BOOLNAMES 1
#include <ncurses_def.h>
-
+#ifdef __cplusplus
+#undef const
+#undef inline
+#endif
+#ifndef __cplusplus
+#ifdef NEED_MBSTATE_T_DEF
+#define mbstate_t int
+#endif
+#endif
#endif /* NC_CONFIG_H */
diff --git a/pkg/ncurses/rev b/pkg/ncurses/rev
@@ -1 +1 @@
-1
+2
diff --git a/pkg/ncurses/sha256 b/pkg/ncurses/sha256
@@ -1 +1 @@
-f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 ncurses-6.0.tar.gz
+aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz
diff --git a/pkg/ncurses/sources.txt b/pkg/ncurses/sources.txt
@@ -101,6 +101,7 @@ ncurses/widechar/lib_wunctrl.c
ncurses/base/legacy_coding.c
ncurses/base/lib_dft_fgbg.c
ncurses/tinfo/lib_print.c
+ncurses/base/new_pair.c
ncurses/base/resizeterm.c
ncurses/tinfo/use_screen.c
ncurses/base/use_window.c
diff --git a/pkg/ncurses/subst.sed b/pkg/ncurses/subst.sed
@@ -1,17 +1,10 @@
-s,@NCURSES_MAJOR@,6,
-s,@NCURSES_MINOR@,0,
-s,@NCURSES_PATCH@,20150808,
-
s,@BROKEN_LINKER@,0,
-s,@CAPTOINFO@,captoinfo,
s,@GENERATED_EXT_FUNCS@,generated,
s,@HAVE_STDINT_H@,1,
s,@HAVE_TCGETATTR@,1,
s,@HAVE_TERMIOS_H@,1,
s,@HAVE_TERMIO_H@,0,
s,@HAVE_VSSCANF@,1,
-s,@INFOCMP@,infocmp,
-s,@INFOTOCAP@,infotocap,
s,@NCURSES_CCHARW_MAX@,5,
s,@NCURSES_CH_T@,cchar_t,
s,@NCURSES_CONST@,const,
@@ -20,10 +13,16 @@ s,@NCURSES_EXT_FUNCS@,1,
s,@NCURSES_INLINE@,inline,
s,@NCURSES_INTEROP_FUNCS@,1,
s,@NCURSES_LIBUTF8@,0,
+s,@NCURSES_MAJOR@,6,
+s,@NCURSES_MINOR@,1,
s,@NCURSES_MOUSE_VERSION@,2,
s,@NCURSES_OK_WCHAR_T@,1,
s,@NCURSES_OPAQUE@,0,
+s,@NCURSES_OPAQUE_FORM@,0,
+s,@NCURSES_OPAQUE_MENU@,0,
+s,@NCURSES_OPAQUE_PANEL@,0,
s,@NCURSES_OSPEED@,short,
+s,@NCURSES_PATCH@,20180127,
s,@NCURSES_SBOOL@,char,
s,@NCURSES_SIZE_T@,short,
s,@NCURSES_SP_FUNCS@,1,
@@ -31,21 +30,27 @@ s,@NCURSES_TPARM_ARG@,intptr_t,
s,@NCURSES_TPARM_VARARGS@,1,
s,@NCURSES_USE_DATABASE@,1,
s,@NCURSES_USE_TERMCAP@,0,
+s,@NCURSES_WATTR_MACROS@,1,
s,@NCURSES_WCHAR_T@,0,
+s,@NCURSES_WCWIDTH_GRAPHICS@,1,
s,@NCURSES_WINT_T@,0,
s,@NCURSES_XNAMES@,1,
s,@NEED_WCHAR_H@,1,
s,@TERMINFO@,/share/terminfo,
s,@TERMINFO_DIRS@,/share/terminfo,
-s,@TIC@,tic,
-s,@TOE@,toe,
-s,@TSET@,tset,
-s,@USE_CXX_BOOL@,0,
+s,@USE_CXX_BOOL@,defined(__cplusplus),
s,@cf_cv_1UL@,1U,g
s,@cf_cv_enable_lp64@,1,
-s,@cf_cv_enable_opaque@,NCURSES_OPAQUE,
s,@cf_cv_enable_reentrant@,0,
s,@cf_cv_header_stdbool_h@,1,
s,@cf_cv_type_of_bool@,unsigned char,
s,@cf_cv_typeof_chtype@,uint32_t,
s,@cf_cv_typeof_mmask_t@,uint32_t,
+
+s,@CAPTOINFO@,captoinfo,
+s,@INFOCMP@,infocmp,
+s,@INFOTOCAP@,infotocap,
+s,@RESET@,reset,
+s,@TIC@,tic,
+s,@TOE@,toe,
+s,@TSET@,tset,
diff --git a/pkg/ncurses/url b/pkg/ncurses/url
@@ -1 +1 @@
-url = "http://invisible-mirror.net/archives/ncurses/ncurses-6.0.tar.gz"
+url = "http://invisible-mirror.net/archives/ncurses/ncurses-6.1.tar.gz"
