From 41ea63ca5c05c23c6837ddd6b19ea0892ae2d134 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 18 Nov 2016 21:52:07 -0800 Subject: Add vis scm --- .gitmodules | 4 + extra/gen.rc | 1 + extra/vis/gen.rc | 188 +++++++++++++++++++++ .../0001-Allow-building-lpeg-statically.patch | 54 ++++++ .../patch/0002-Set-default-theme-to-dark-16.patch | 22 +++ extra/vis/patch/0003-Set-dates-in-man-pages.patch | 62 +++++++ extra/vis/rev | 1 + extra/vis/src | 1 + 8 files changed, 333 insertions(+) create mode 100644 extra/vis/gen.rc create mode 100644 extra/vis/patch/0001-Allow-building-lpeg-statically.patch create mode 100644 extra/vis/patch/0002-Set-default-theme-to-dark-16.patch create mode 100644 extra/vis/patch/0003-Set-dates-in-man-pages.patch create mode 100644 extra/vis/rev create mode 160000 extra/vis/src diff --git a/.gitmodules b/.gitmodules index 0e6140e1..a51730db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -183,6 +183,10 @@ [submodule "extra/the_silver_searcher/src"] path = extra/the_silver_searcher/src url = https://github.com/ggreer/the_silver_searcher +[submodule "extra/vis/src"] + path = extra/vis/src + url = https://github.com/martanne/vis + ignore = all [submodule "media/alsa-lib/src"] path = media/alsa-lib/src url = git://git.alsa-project.org/alsa-lib.git diff --git a/extra/gen.rc b/extra/gen.rc index c79cab18..90660b72 100644 --- a/extra/gen.rc +++ b/extra/gen.rc @@ -18,3 +18,4 @@ subgen sshfs subgen the_silver_searcher subgen transmission subgen unzip +subgen vis diff --git a/extra/vis/gen.rc b/extra/vis/gen.rc new file mode 100644 index 00000000..5adf038f --- /dev/null +++ b/extra/vis/gen.rc @@ -0,0 +1,188 @@ +version=v0.2-467-g8cdfd27 +cflags\ + '-std=c99' \ + -D 'CONFIG_LUA=1' \ + -D 'CONFIG_LUA_STATIC=1' \ + -D '_POSIX_C_SOURCE=200809L' \ + -D '_XOPEN_SOURCE=700' \ + -D 'VERSION=''"'$version'"''' \ + -D 'VIS_PATH=''"/share/vis"''' \ + -D NDEBUG\ + -isystem devel/lua/src/src\ + -isystem extra/libtermkey/src\ + -isystem '$builddir'/extra/ncurses/include\ + -I '$outdir' + +build '$outdir'/config.h copy '$srcdir'/config.def.h + +phony deps config.h phony/extra/ncurses/headers '$builddir'/^(\ + devel/lua/fetch.stamp\ + extra/libtermkey/fetch.stamp\ +) + +exe vis -d 'phony/$dir/deps' \ + array.c buffer.c libutf.c main.c map.c register.c ring-buffer.c\ + sam.c text.c text-motions.c text-objects.c text-regex.c text-util.c\ + ui-curses.c view.c vis.c vis-lua.c vis-modes.c vis-motions.c\ + vis-operators.c vis-prompt.c vis-text-objects.c\ + '$builddir'/^(\ + devel/lua/liblua.a\ + extra/libtermkey/libtermkey.a.d\ + extra/lpeg/liblpeg.a\ + extra/ncurses/libncurses.a\ + ) +file bin/vis '$outdir'/vis 755 + +exe vis-menu vis-menu.c +file bin/vis-menu '$outdir'/vis-menu 755 + +file bin/vis-open '$srcdir'/vis-open 755 + +for(f in vis.1 vis-menu.1 vis-open.1) { + build '$outdir'/$f sed '$srcdir'/$f ; with\ + expr s,VERSION,$version, + file share/man/man1/$f '$outdir'/$f 644 +} + +file share/vis/vis.lua '$srcdir'/vis.lua 644 +file share/vis/visrc.lua '$srcdir'/visrc.lua 644 + +# +Date: Fri, 18 Nov 2016 21:35:52 -0800 +Subject: [PATCH] Allow building lpeg statically + +--- + Makefile | 3 ++- + vis-lua.c | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e221b67..b28590c 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ MANPREFIX ?= ${PREFIX}/man + VERSION = $(shell git describe --always 2>/dev/null || echo "0.2") + + CONFIG_LUA ?= 1 ++CONFIG_LUA_STATIC ?= 0 + CONFIG_ACL ?= 0 + CONFIG_SELINUX ?= 0 + +@@ -25,7 +26,7 @@ CFLAGS_VIS = $(CFLAGS_AUTO) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) $(CFLAGS_ACL) \ + $(CFLAGS_SELINUX) $(CFLAGS_LUA) $(CFLAGS_STD) + + CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/vis\" +-CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} ++CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} -DCONFIG_LUA_STATIC=${CONFIG_LUA_STATIC} + CFLAGS_VIS += -DCONFIG_SELINUX=${CONFIG_SELINUX} + CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL} + CFLAGS_VIS += ${CFLAGS_DEBUG} +diff --git a/vis-lua.c b/vis-lua.c +index 5b039ba..f6ed68e 100644 +--- a/vis-lua.c ++++ b/vis-lua.c +@@ -1404,6 +1404,15 @@ void vis_lua_init(Vis *vis) { + vis->lua = L; + luaL_openlibs(L); + ++#if CONFIG_LUA_STATIC ++ extern int luaopen_lpeg(lua_State *L); ++ lua_getglobal(L, "package"); ++ lua_getfield(L, -1, "preload"); ++ lua_pushcfunction(L, luaopen_lpeg); ++ lua_setfield(L, -2, "lpeg"); ++ lua_pop(L, 2); ++#endif ++ + /* remove any relative paths from lua's default package.path */ + vis_lua_path_strip(vis); + +-- +2.10.2 + diff --git a/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch b/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch new file mode 100644 index 00000000..eeb358d6 --- /dev/null +++ b/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch @@ -0,0 +1,22 @@ +From be040c6797873884126b25c78b72922ad9e13f4d Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 18 Nov 2016 21:53:25 -0800 +Subject: [PATCH] Set default theme to dark-16 + +--- + vis.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vis.lua b/vis.lua +index 0d14f8e..6c0e2a7 100644 +--- a/vis.lua ++++ b/vis.lua +@@ -417,4 +417,4 @@ vis.events.win_status = function(win) + win:status(left, right); + end + +-vis.events.theme_change((not vis.ui or vis.ui.colors <= 16) and "default-16" or "default-256") ++vis.events.theme_change("dark-16") +-- +2.10.2 + diff --git a/extra/vis/patch/0003-Set-dates-in-man-pages.patch b/extra/vis/patch/0003-Set-dates-in-man-pages.patch new file mode 100644 index 00000000..14a37bd7 --- /dev/null +++ b/extra/vis/patch/0003-Set-dates-in-man-pages.patch @@ -0,0 +1,62 @@ +From 76507f6965a2553d3bb424c1278b6c7244bda7f6 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 18 Nov 2016 23:31:52 -0800 +Subject: [PATCH] Set dates in man pages + +--- + Makefile | 6 +++--- + vis-clipboard.1 | 2 +- + vis-menu.1 | 2 +- + vis-open.1 | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index b28590c..68d6e08 100644 +--- a/Makefile ++++ b/Makefile +@@ -101,9 +101,9 @@ install: vis vis-menu + @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 + @sed -e "s/VERSION/${VERSION}/g" < vis.1 > ${DESTDIR}${MANPREFIX}/man1/vis.1 +- @sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$(date +'%B %m, %Y')/g" < vis-menu.1 > ${DESTDIR}${MANPREFIX}/man1/vis-menu.1 +- @sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$(date +'%B %m, %Y')/g" < vis-clipboard.1 > ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1 +- @sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$(date +'%B %m, %Y')/g" < vis-open.1 > ${DESTDIR}${MANPREFIX}/man1/vis-open.1 ++ @sed -e "s/VERSION/${VERSION}/g" < vis-menu.1 > ${DESTDIR}${MANPREFIX}/man1/vis-menu.1 ++ @sed -e "s/VERSION/${VERSION}/g" < vis-clipboard.1 > ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1 ++ @sed -e "s/VERSION/${VERSION}/g" < vis-open.1 > ${DESTDIR}${MANPREFIX}/man1/vis-open.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis-menu.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1 +diff --git a/vis-clipboard.1 b/vis-clipboard.1 +index e91023b..8d7c6e2 100644 +--- a/vis-clipboard.1 ++++ b/vis-clipboard.1 +@@ -1,4 +1,4 @@ +-.Dd MONTH DAY, YEAR ++.Dd June 16, 2016 + .Os Vis VERSION + .Dt VIS-CLIPBOARD 1 + +diff --git a/vis-menu.1 b/vis-menu.1 +index 00cb3da..84789ff 100644 +--- a/vis-menu.1 ++++ b/vis-menu.1 +@@ -1,4 +1,4 @@ +-.Dd MONTH DAY, YEAR ++.Dd May 28, 2016 + .Os Vis VERSION + .Dt VIS-MENU 1 + +diff --git a/vis-open.1 b/vis-open.1 +index 749ab8f..5f77a17 100644 +--- a/vis-open.1 ++++ b/vis-open.1 +@@ -1,4 +1,4 @@ +-.Dd MONTH DAY, YEAR ++.Dd June 21, 2016 + .Os Vis VERSION + .Dt VIS-OPEN 1 + +-- +2.10.2 + diff --git a/extra/vis/rev b/extra/vis/rev new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/extra/vis/rev @@ -0,0 +1 @@ +1 diff --git a/extra/vis/src b/extra/vis/src new file mode 160000 index 00000000..8cdfd279 --- /dev/null +++ b/extra/vis/src @@ -0,0 +1 @@ +Subproject commit 8cdfd2790da62cb8607c6e2cc783fda001ab0fec -- cgit v1.2.3