linux-qubasis

commit 95d6448782c730a06bca43f8b0dfee2fb9895b90
parent 4cd34ac8e307b609505848390f4f7f1b4e0e9ed4
Author: Jul <jul@9o.is>
Date:   Sun, 19 Oct 2025 05:43:49 -0400

add st 0.9.3

Diffstat:
M
gen.sh
 | 
1
+
D
pkg/st/build
 | 
38
--------------------------------------
D
pkg/st/config.mk
 | 
25
-------------------------
A
pkg/st/gen.sh
 | 
37
+++++++++++++++++++++++++++++++++++++
R
pkg/st/patches/0001-add-dynamic-cursor-color-patch.patch -> pkg/st/patch/0001-add-dynamic-cursor-color-patch.patch
 | 
0

D
pkg/st/terminal
 | 
7
-------

6 files changed, 38 insertions(+), 70 deletions(-)
diff --git a/gen.sh b/gen.sh
@@ -45,6 +45,7 @@ subgen pkg/probe
 subgen pkg/rc
 subgen pkg/sbase
 subgen pkg/sinit
+subgen pkg/st
 subgen pkg/ubase
 subgen pkg/util-linux
 subgen pkg/vis
diff --git a/pkg/st/build b/pkg/st/build
@@ -1,38 +0,0 @@
-#!/bin/sh
-set -euo pipefail
-
-# required:
-# fontconfig-devel
-# libXft-devel
-
-gitref="98610fcd"
-repodir="$srcdir/repo"
-
-if [ "$skip_clean" != "true" ]; then
-    git -C "$repodir" clean -dx
-    git -C "$repodir" reset --hard "$gitref"
-
-    for patch in $srcdir/patches/*.patch; do
-        git -C "$repodir" am --no-gpg-sign "$patch"
-    done
-fi
-
-rm -rf "$outdir"
-cp "$srcdir/config.h" "$repodir"
-cp "$srcdir/config.mk" "$repodir"
-
-export TERMINFO="$outdir/usr/share/terminfo"
-
-make -C "$repodir"
-make DESTDIR="$outdir" -C "$repodir" install
-
-cp "$srcdir/terminal" "$outdir/usr/bin/terminal"
-chmod +x "$outdir/usr/bin/terminal"
-
-if [ "$local_install" == "true" ]; then
-    export TERMINFO="/usr/share/terminfo"
-
-    sudo make -C "$repodir" install
-    sudo cp "$srcdir/terminal" /usr/bin/terminal
-    sudo chmod +x /usr/bin/terminal
-fi
diff --git a/pkg/st/config.mk b/pkg/st/config.mk
@@ -1,25 +0,0 @@
-# st version
-VERSION = 0.9.2
-
-# paths
-PREFIX = /usr
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-PKG_CONFIG = pkg-config
-
-# includes and libs
-INCS = -I$(X11INC) \
-       `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-       `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2`
-
-# flags
-STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
-STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
-
diff --git a/pkg/st/gen.sh b/pkg/st/gen.sh
@@ -0,0 +1,37 @@
+fetch git
+
+setv cc cc
+setv ld ld
+
+setv cflags "
+    -D VERSION='\"0.9.3\"'
+    -D _XOPEN_SOURCE=600
+    -I $dir
+    -I $srcdir
+    -I /usr/include
+    $(pkg-config --cflags fontconfig)
+    $(pkg-config --cflags freetype2)
+    -Wno-unused-parameter
+    -Wno-unused-function
+    -Wno-sign-compare
+    -Wno-type-limits
+    -Wno-implicit-fallthrough
+"
+
+setv ldflags "
+    -lm
+    -lrt
+    -lX11
+    -lutil
+    -lXft
+    $(pkg-config --libs fontconfig)
+    $(pkg-config --libs freetype2)
+"
+
+exe st "
+    $srcdir/st.c
+    $srcdir/x.c
+"
+
+bin st
+man st.1
diff --git a/pkg/st/patches/0001-add-dynamic-cursor-color-patch.patch b/pkg/st/patch/0001-add-dynamic-cursor-color-patch.patch
diff --git a/pkg/st/terminal b/pkg/st/terminal
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export ABDUCO_SESSION=${1-default}
-export DVTM_STATUS_FIFO=/tmp/dvtm-status.$ABDUCO_SESSION
-export DVTM_CMD_FIFO=/tmp/dvtm-cmd.$ABDUCO_SESSION
-
-exec st -e abduco -A $ABDUCO_SESSION dvtm -s $DVTM_STATUS_FIFO -c $DVTM_CMD_FIFO