commit 69ffd3d
hovercats
·
2026-10-26 23:55:56 +0000 UTC
parent 9c2a1ed
cterm: bump to v1.0 maus submodule was removed, so fetch this as a standalone package branch was changed to master too, as commits seems to have been ceased on the 'main' branch.
10 files changed,
+52,
-46
+4,
-0
1@@ -495,3 +495,7 @@
2 url = https://srcdump.net/uint/cterm.git
3 ignore = all
4 shallow = true
5+[submodule "pkg/maus/src"]
6+ path = pkg/maus/src
7+ url = https://srcdump.net/uint/maus.git
8+ shallow = true
+1,
-3
1@@ -11,9 +11,7 @@ static const int win_width = 70; /* in columns */
2 static const int win_height = 25; /* in rows */
3 static const char win_title[] = "cterm";
4 static const int win_fps = 60;
5-
6-static const int pad_x = 8;
7-static const int pad_y = 8;
8+static const int padding = 8;
9
10 static const char* const shell = "/bin/sh"; /* NULL uses $SHELL */
11 static const char term_name[] = "vt100";
+3,
-22
1@@ -5,37 +5,18 @@ cflags{
2 '-D BACKEND_WAY',
3 '-I $dir',
4 '-I $srcdir/include',
5- '-I $srcdir/libmaus/include',
6- '-isystem $builddir/pkg/libxkbcommon/include',
7- '-isystem $builddir/pkg/wayland/include',
8- '-isystem $builddir/pkg/wayland-protocols/include',
9+ '-isystem $builddir/pkg/maus/include',
10 }
11
12 pkg.deps = {
13- 'pkg/libxkbcommon/headers',
14- 'pkg/wayland/headers',
15- 'pkg/wayland-protocols/headers',
16+ 'pkg/maus/headers',
17 }
18
19-lib('libmaus.a', [[libmaus/source/(
20- maus.c maus_font.c
21- maus_wayland.c utils.c
22- )
23- $builddir/pkg/(
24- wayland-protocols/xdg-shell-protocol.c.o
25- wayland-protocols/pointer-constraints-unstable-v1-protocol.c.o
26- wayland-protocols/relative-pointer-unstable-v1-protocol.c.o
27- libxkbcommon/libxkbcommon.a
28- wayland/libwayland-cursor.a.d
29- wayland/libwayland-client.a.d
30- )
31-]])
32-
33 exe('cterm', [[source/(
34 cterm.c utils.c font.c
35 term.c draw.c
36 )
37- libmaus.a.d
38+ $builddir/pkg/maus/libmaus.a.d
39 ]])
40
41 file('bin/cterm', '755', '$outdir/cterm')
1@@ -1,28 +1,14 @@
2-From 85f70e78d0e589361d873e5463b58bc73898508c Mon Sep 17 00:00:00 2001
3+From 2ba8a08f3176b20a1ec5b1da9316b3fc240ad6dc Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5-Date: Wed, 2 Sep 2026 14:15:15 +0200
6+Date: Tue, 27 Oct 2026 00:13:58 +0100
7 Subject: [PATCH] dont use relative path for config.h
8
9 ---
10- source/cterm.c | 2 +-
11- source/term.c | 2 +-
12- 2 files changed, 2 insertions(+), 2 deletions(-)
13+ source/term.c | 2 +-
14+ 1 file changed, 1 insertion(+), 1 deletion(-)
15
16-diff --git a/source/cterm.c b/source/cterm.c
17-index 08993ce..8c0d734 100644
18---- a/source/cterm.c
19-+++ b/source/cterm.c
20-@@ -19,7 +19,7 @@
21-
22- #include <maus.h>
23-
24--#include "../config.h"
25-+#include "config.h"
26- #include "draw.h"
27- #include "font.h"
28- #include "term.h"
29 diff --git a/source/term.c b/source/term.c
30-index d07558a..0af05cb 100644
31+index 7e3408e..3a53de8 100644
32 --- a/source/term.c
33 +++ b/source/term.c
34 @@ -2,7 +2,7 @@
+1,
-1
1@@ -1 +1 @@
2-Subproject commit 8c67496e9c7b007ba080b1e6da63d1fe23bf5193
3+Subproject commit 2512b6a91b23d83e376c68b6376aea57a1397a8c
+1,
-1
1@@ -1 +1 @@
2-8c67496
3+1.0
+1,
-0
1@@ -66,6 +66,7 @@ subgen 'lz4'
2 subgen 'make'
3 subgen 'man-pages-posix'
4 subgen 'mandoc'
5+subgen 'maus'
6 subgen 'mpv'
7 subgen 'mtdev'
8 subgen 'muon'
+34,
-0
1@@ -0,0 +1,34 @@
2+cflags{
3+ '-std=c99',
4+ '-D BACKEND_WAY',
5+ '-I $srcdir/include',
6+ '-isystem $builddir/pkg/libxkbcommon/include',
7+ '-isystem $builddir/pkg/wayland/include',
8+ '-isystem $builddir/pkg/wayland-protocols/include',
9+}
10+
11+pkg.deps = {
12+ 'pkg/libxkbcommon/headers',
13+ 'pkg/wayland/headers',
14+ 'pkg/wayland-protocols/headers',
15+}
16+
17+pkg.hdrs = copy('$outdir/include', '$srcdir/include', {
18+ 'maus.h', 'maus_wayland.h', 'maus_input.h', 'uletypes.h'
19+})
20+
21+lib('libmaus.a', [[source/(
22+ maus.c maus_font.c
23+ maus_wayland.c utils.c
24+ )
25+ $builddir/pkg/(
26+ wayland-protocols/xdg-shell-protocol.c.o
27+ wayland-protocols/pointer-constraints-unstable-v1-protocol.c.o
28+ wayland-protocols/relative-pointer-unstable-v1-protocol.c.o
29+ libxkbcommon/libxkbcommon.a
30+ wayland/libwayland-cursor.a.d
31+ wayland/libwayland-client.a.d
32+ )
33+]])
34+
35+fetch 'git'
+1,
-0
1@@ -0,0 +1 @@
2+Subproject commit 21de1888affaa583a3e447ed9bc3d924bc78e694
+1,
-0
1@@ -0,0 +1 @@
2+21de188