diff options
| author | John Vogel <jvogel@stygian.me> | 2024-11-15 21:19:32 -0500 |
|---|---|---|
| committer | John Vogel <jvogel@stygian.me> | 2024-11-15 21:19:32 -0500 |
| commit | 6e7b912047c4e5a5e7e338f65fcc41c14709f189 (patch) | |
| tree | a5a19c393ec82ec678f2c0ec3ad691587c32056e | |
| parent | 45cd7d3cea47aba9906905fe94d155ddb78a07e1 (diff) | |
| download | forked-aports-6e7b912047c4e5a5e7e338f65fcc41c14709f189.tar.gz | |
local/vis: add upstream pending fix
| -rw-r--r-- | vis/0001-lua-fix-table-member-reference-in-set_syntax.patch | 26 | ||||
| -rw-r--r-- | vis/APKBUILD | 11 |
2 files changed, 33 insertions, 4 deletions
diff --git a/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch b/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch new file mode 100644 index 0000000..af1ba9c --- /dev/null +++ b/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch @@ -0,0 +1,26 @@ +From f840bcaf95dea328b9edc76c68e27d42cf79330b Mon Sep 17 00:00:00 2001 +From: Florian Fischer <florian.fischer@muhq.space> +Date: Thu, 14 Nov 2024 14:44:33 +0100 +Subject: [PATCH] lua: fix table member reference in set_syntax + +Reported-By: aimixsaka <aimixsaka@gmail.com> +--- + lua/vis.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lua/vis.lua b/lua/vis.lua +index d06bbaf..9ac41b0 100644 +--- a/lua/vis.lua ++++ b/lua/vis.lua +@@ -288,7 +288,7 @@ vis.types.window.set_syntax = function(win, syntax) + if type(style) == 'table' then + local s = '' + if style.attr then +- s = string.format("%s,%s", s, attr) ++ s = string.format("%s,%s", s, style.attr) + elseif style.fore then + s = string.format("%s,fore:%s", s, style.fore) + elseif style.back then +-- +2.47.0 + diff --git a/vis/APKBUILD b/vis/APKBUILD index 257826e..73cb9e7 100644 --- a/vis/APKBUILD +++ b/vis/APKBUILD @@ -3,16 +3,17 @@ pkgname=vis pkgver=0.9_git20241025 _commit=c0d083f4ca827d83c6b8beafd52a0ea95ece73da -pkgrel=0 +pkgrel=2 pkgdesc="Modern, legacy free, simple yet efficient vim-like editor" url="https://github.com/martanne/vis" arch="all" license="ISC" depends="!outils-vis lua5.3-lpeg" makedepends="acl-dev libtermkey-dev lua5.3-dev ncurses-dev tre-dev" -checkdepends="vim" -subpackages="$pkgname-doc" +checkdepends="luacheck vim" +subpackages="$pkgname-dbg $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/martanne/vis/archive/$_commit.tar.gz + 0001-lua-fix-table-member-reference-in-set_syntax.patch " builddir="$srcdir/vis-$_commit" @@ -22,11 +23,12 @@ build() { --enable-lua \ --enable-acl \ --enable-tre - make + make debug } check() { make test + make luacheck } package() { @@ -35,4 +37,5 @@ package() { sha512sums=" 1a1675d20e39206b54f4fadc6e86506f036f527ff91b5fe392f2b0aa787c49f00e0217e85ce851553259fa86bc07b27bcd6ebd1d253ee4974def04e5d1061f0e vis-0.9_git20241025.tar.gz +f38bd8dbad9fb0230a960aa0e6e9b9f1f6f10b414ed9736b1d931785c3ee2d8c4e46b03237cf41a511bb64fdd85628807a977391c8f5d9c09d323efaa6e453a4 0001-lua-fix-table-member-reference-in-set_syntax.patch " |