oasis

commit: 150a7855e4cb8217da30783b56ee7c12c6b4afef
parent 88ec033ced9bae763f48bbad4d3cb99e7c212a7b
Author: Michael Forney <mforney@mforney.org>
Date:   Sun,  7 Jun 2020 14:01:17 -0700

vis: Update to 0.6

Diffstat:
M
pkg/vis/gen.lua
13
+++++--------
D
pkg/vis/patch/0002-Fix-terminal-UI-on-serial-console.patch
34
----------------------------------
M
pkg/vis/ver
2
+-

3 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua
@@ -1,4 +1,4 @@
-set('version', 'v0.5')
+set('version', 'v0.6')
 cflags{
 	'-std=c99',
 	'-D CONFIG_HELP=1',
@@ -9,7 +9,6 @@ cflags{
 	'-D CONFIG_SELINUX=0',
 	'-D CONFIG_ACL=0',
 	'-D HAVE_MEMRCHR=1',
-	'-D _POSIX_C_SOURCE=200809L',
 	'-D _XOPEN_SOURCE=700',
 	[[-D 'VERSION="$version"']],
 	string.format([[-D 'VIS_PATH="%s/share/vis"']], config.prefix),
@@ -34,12 +33,10 @@ exe('vis', [[
 	sam.c text.c text-motions.c text-objects.c text-util.c
 	ui-terminal.c view.c vis.c vis-lua.c vis-modes.c vis-motions.c
 	vis-operators.c vis-registers.c vis-marks.c vis-prompt.c vis-text-objects.c text-regex.c
-	$builddir/pkg/(
-		libtermkey/libtermkey.a.d
-		lpeg/liblpeg.a
-		lua/liblua.a
-		ncurses/libncurses.a
-	)
+	$builddir/pkg/libtermkey/libtermkey.a.d
+	$builddir/pkg/lpeg/liblpeg.a
+	$builddir/pkg/lua/liblua.a
+	$builddir/pkg/ncurses/libncurses.a
 ]])
 file('bin/vis', '755', '$outdir/vis')
 
diff --git a/pkg/vis/patch/0002-Fix-terminal-UI-on-serial-console.patch b/pkg/vis/patch/0002-Fix-terminal-UI-on-serial-console.patch
@@ -1,34 +0,0 @@
-From c2889016484ea3c36ed04228c3ce0df549260273 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
-Date: Sat, 6 Jun 2020 13:20:43 -0700
-Subject: [PATCH] Fix terminal UI on serial console
-
----
- ui-terminal.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ui-terminal.c b/ui-terminal.c
-index c862f63..9cdfd7e 100644
---- a/ui-terminal.c
-+++ b/ui-terminal.c
-@@ -371,13 +371,13 @@ static void ui_resize(Ui *ui) {
- 	int width = 80, height = 24;
- 
- 	if (ioctl(STDERR_FILENO, TIOCGWINSZ, &ws) != -1) {
--		width = ws.ws_col;
--		height = ws.ws_row;
-+		if (ws.ws_col > 0)
-+			width = ws.ws_col;
-+		if (ws.ws_row > 0)
-+			height = ws.ws_row;
- 	}
- 
--	width = MAX(width, 1);
- 	width = MIN(width, MAX_WIDTH);
--	height = MAX(height, 1);
- 	height = MIN(height, MAX_HEIGHT);
- 	if (!ui_term_backend_resize(tui, width, height))
- 		return;
--- 
-2.27.0
-
diff --git a/pkg/vis/ver b/pkg/vis/ver
@@ -1 +1 @@
-0.5-191-g7648280 r1
+0.6 r0