Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions user/lua5.5-lpeg/patches
29 changes: 29 additions & 0 deletions user/lua5.5-lpeg/template.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
pkgname = "lua5.5-lpeg"
pkgver = "1.1.0"
pkgrel = 0
build_style = "makefile"
make_build_target = "lpeg.so"
make_check_target = "test"
makedepends = ["lua5.5-devel"]
pkgdesc = "Pattern-matching library based on Parsing Expression Grammars"
license = "MIT"
url = "https://www.inf.puc-rio.br/~roberto/lpeg"
source = f"{url}/lpeg-{pkgver}.tar.gz"
sha256 = "4b155d67d2246c1ffa7ad7bc466c1ea899bbc40fef0257cc9c03cecbaed4352a"
# for check
exec_wrappers = [("/usr/bin/lua5.5", "lua")]


def init_configure(self):
self.tool_flags["CFLAGS"] += [
f"-I{self.profile().sysroot / 'usr/include/lua5.5'}",
"-fPIC",
]


def install(self):
self.install_license("lpeg.html")
self.install_dir("usr/lib/lua/5.5")
self.install_file("lpeg.so", "usr/lib/lua/5.5", mode=0o755)
self.install_dir("usr/share/lua/5.5")
self.install_file("re.lua", "usr/share/lua/5.5")
1 change: 1 addition & 0 deletions user/lua5.5-lpeg/update.py
52 changes: 52 additions & 0 deletions user/vis/patches/vendor-libtermkey.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
diff -rU3 a/configure b/configure
--- a/configure 2026-03-01 18:59:01.000000000 -0300
+++ b/configure 2026-03-11 11:46:42.858604337 -0300
@@ -350,35 +350,8 @@
test "$curses" = "yes" -a -z "${CFLAGS_CURSES}" && fail "$0: cannot find libcurses"
fi

-# libtermkey is a mandatory dependency
-
-printf "checking for libtermkey... "
-cat > "$tmpc" <<EOF
-#include <termkey.h>
-
-int main(int argc, char *argv[]) {
- TERMKEY_CHECK_VERSION;
- return 0;
-}
-EOF
-
-if test "$have_pkgconfig" = "yes" ; then
- CFLAGS_TERMKEY=$($PKG_CONFIG $pkg_config_flags --cflags termkey 2>/dev/null)
- LDFLAGS_TERMKEY=$($PKG_CONFIG $pkg_config_flags --libs termkey 2>/dev/null)
-fi
-
-if test -z "$LDFLAGS_TERMKEY"; then
- CFLAGS_TERMKEY=""
- LDFLAGS_TERMKEY="-ltermkey"
-fi
-
-if $CC $CFLAGS $CFLAGS_TERMKEY "$tmpc" $LDFLAGS $LDFLAGS_TERMKEY $LDFLAGS_CURSES \
- -o "$tmpo" >/dev/null 2>&1; then
- printf "%s\n" "yes"
-else
- printf "%s\n" "no"
- fail "$0: cannot find libtermkey"
-fi
+CFLAGS_TERMKEY="-isystem $PWD"
+LDFLAGS_TERMKEY="$PWD/termkey.c $PWD/driver-csi.c $PWD/driver-ti.c"

if test "$tre" != "no" ; then

diff -rU3 a/vis.c b/vis.c
--- a/vis.c 2026-03-01 18:59:01.000000000 -0300
+++ b/vis.c 2026-03-11 11:44:04.499665919 -0300
@@ -1,6 +1,6 @@
#include "util.h"

-#include <termkey.h>
+#include "termkey.h"

#include "vis-core.h"
#include "vis-subprocess.h"
47 changes: 47 additions & 0 deletions user/vis/template.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
pkgname = "vis"
pkgver = "0.9_git20260301"
_commit = "75cd95b08f379a32519ae4bbd977fea09ec6c847"
_libtermkeyver = "0.22"
pkgrel = 0
build_style = "configure"
configure_args = ["--prefix=/usr"]
make_check_target = "test"
hostmakedepends = ["pkgconf"]
makedepends = [
"acl-devel",
"lua5.5-devel",
"lua5.5-lpeg",
"ncurses-devel",
]
checkdepends = ["vim"]
depends = ["lua5.5-lpeg"]
pkgdesc = "Modern, legacy-free, simple yet efficient vim-like text editor"
license = "ISC"
url = "https://github.com/martanne/vis"
source = [
f"https://github.com/martanne/vis/archive/{_commit}.tar.gz",
f"https://www.leonerd.org.uk/code/libtermkey/libtermkey-{_libtermkeyver}.tar.gz",
]
source_paths = ["", "./libtermkey"]
sha256 = [
"18b5597863d55bd70fbc43e2921bfdd7bc5a346f99afc38b9de5f84aa3fc1f3e",
"6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600",
]
hardening = ["vis", "cfi"]


def prepare(self):
self.mv("libtermkey/termkey.h", ".")
self.mv("libtermkey/termkey-internal.h", ".")
self.mv("libtermkey/termkey.c", ".")
self.mv("libtermkey/driver-csi.c", ".")
self.mv("libtermkey/driver-ti.c", ".")


def post_install(self):
self.install_license("LICENSE")
self.mv(self.destdir / "usr/bin/vis", self.destdir / "usr/bin/vis-editor")
self.mv(
self.destdir / "usr/share/man/man1/vis.1",
self.destdir / "usr/share/man/man1/vis-editor.1",
)