diff options
| -rw-r--r-- | pkg/vis/gen.rc | 2 | ||||
| -rw-r--r-- | pkg/vis/patch/0001-Allow-building-lpeg-statically.patch | 54 | ||||
| -rw-r--r-- | pkg/vis/patch/0001-Set-default-theme-to-dark-16.patch (renamed from pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch) | 4 | ||||
| -rw-r--r-- | pkg/vis/rev | 2 | ||||
| m--------- | pkg/vis/src | 0 |
5 files changed, 4 insertions, 58 deletions
diff --git a/pkg/vis/gen.rc b/pkg/vis/gen.rc index 228c92a1..774ed726 100644 --- a/pkg/vis/gen.rc +++ b/pkg/vis/gen.rc @@ -2,7 +2,7 @@ version=v0.2-539-g37d98f3 cflags\ '-std=c99' \ -D 'CONFIG_LUA=1' \ - -D 'CONFIG_LUA_STATIC=1' \ + -D 'CONFIG_LPEG=1' \ -D '_POSIX_C_SOURCE=200809L' \ -D '_XOPEN_SOURCE=700' \ -D 'VERSION=''"'$version'"''' \ diff --git a/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch deleted file mode 100644 index 025bfb41..00000000 --- a/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7a20eee4766219a030f8f581713d9a2b04d2e0ea Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -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 962fb7e..201c0c1 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,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 - -@@ -27,7 +28,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 29e94ef..83d2e52 100644 ---- a/vis-lua.c -+++ b/vis-lua.c -@@ -1889,6 +1889,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/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch b/pkg/vis/patch/0001-Set-default-theme-to-dark-16.patch index 254b5c5c..39ad8387 100644 --- a/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch +++ b/pkg/vis/patch/0001-Set-default-theme-to-dark-16.patch @@ -1,4 +1,4 @@ -From af9461125ed8466c39da15ab9845fd95888da66e Mon Sep 17 00:00:00 2001 +From 29891dd5402ef6d9d3a4e10e69fe9d2e953cd34b Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 18 Nov 2016 21:53:25 -0800 Subject: [PATCH] Set default theme to dark-16 @@ -21,5 +21,5 @@ index 13bd7f7..e308fc3 100644 vis.events.subscribe(vis.events.WIN_OPEN, function(win) -- -2.10.2 +2.11.0 diff --git a/pkg/vis/rev b/pkg/vis/rev index 00750edc..b8626c4c 100644 --- a/pkg/vis/rev +++ b/pkg/vis/rev @@ -1 +1 @@ -3 +4 diff --git a/pkg/vis/src b/pkg/vis/src -Subproject 37d98f3119d5d3a63492bf9683ec6a4d68cc1e2 +Subproject 5b689baf18ca5e1feec1fc129d8af19f9c987c5 |