stuff

kernel-src/include/kernel/console.h

@@ -5,6 +5,6 @@
 
 void console_init();
 void console_putc(char c);
-void console_write(char *str, size_t size);
+size_t console_write(char *str, size_t size);
 
 #endif

patches/mlibc/jinx-working-patch.patch

@@ -188,10 +188,10 @@ index 0000000..e5b087a
 +
 diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
 new file mode 100644
-index 0000000..d2ec1c5
+index 0000000..afaee81
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
-@@ -0,0 +1,618 @@
+@@ -0,0 +1,634 @@
 +#include <bits/ensure.h>
 +#include <mlibc/debug.hpp>
 +#include <mlibc/all-sysdeps.hpp>
@@ -203,6 +203,7 @@ index 0000000..d2ec1c5
 +#include <asm/ioctls.h>
 +#include <poll.h>
 +#include <sys/select.h>
++#include <stdio.h>
 +
 +#ifndef MLIBC_BUILDING_RTLD
 +// (s)brk is emulated in the libc rather than being
@@ -334,6 +335,21 @@ index 0000000..d2ec1c5
 +		return 0;
 +	}
 +
++	#ifndef MLIBC_BUILDING_RTLD
++	int sys_ptsname(int fd, char *buffer, size_t length) {
++		int index;
++		int tmp;
++		if (int e = sys_ioctl(fd, TIOCGPTN, &index, &tmp); e)
++			return e;
++
++		if ((size_t)snprintf(buffer, length, "/dev/pts/%d", index) >= length) {
++			return ERANGE;
++		}
++
++		return 0;
++	}
++	#endif
++
 +	int sys_setpgid(pid_t pid, pid_t pgid) {
 +		long ret;
 +		return syscall(SYSCALL_SETPGID, &ret, pid, pgid);

recipes/fontutil

@@ -2,7 +2,7 @@ name=fontutil
 revision=1
 from_source=fontutil
 imagedeps="gcc"
-hostdeps="xgcc xbinutils pkgconfig util-macros"
+hostdeps="xgcc xbinutils pkgconfig"
 deps="mlibc xorgproto"
 
 build() {

recipes/xorg-server

@@ -2,11 +2,11 @@ name=xorg-server
 revision=1
 from_source=xorg-server
 imagedeps="meson ninja base-devel"
-hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros fontutil xtrans"
+hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros xtrans fontutil"
 deps="mlibc libxcvt pixman xorgproto xtrans xkbfile libxfont2 fontutil libgcrypt freetype xkeyboardconfig xkbcomp libxi libxrender libxcb libxext pixman libxdamage"
 
 build() {
-	 ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-pciaccess --disable-libdrm --disable-glx --disable-int10-module --disable-glamor --disable-vgahw --disable-dri3 --disable-dri2 --disable-dri --disable-xephyr --disable-xwayland --disable-xnest --disable-dmx
+	 ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-pciaccess --disable-libdrm --disable-glx --disable-int10-module --disable-glamor --disable-vgahw --disable-dri3 --disable-dri2 --disable-dri --disable-xephyr --disable-xwayland --disable-xnest --disable-dmx --with-fontrootdir=${prefix}/share/fonts/X11
 	make -j${parallelism}
 
 }

source-recipes/fontutil

@@ -1,8 +1,8 @@
 name=fontutil
-version=1.3.3
+version=1.4.1
 source_method=tarball
 tarball_url="https://www.x.org/archive//individual/font/font-util-${version}.tar.xz"
-tarball_sha512="5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9"
+tarball_sha512="cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0"
 hostdeps="automake autoconf libtool pkgconfig util-macros"
 regenerate() {
         autoreconf -fvi

source-recipes/util-macros

@@ -1,8 +1,8 @@
 name=util-macros
-version=1.19.3
+version=1.20.0
 source_method=tarball
-tarball_url="https://www.x.org/pub/individual/util/util-macros-${version}.tar.bz2"
-tarball_sha512="b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2"
+tarball_url="https://www.x.org/pub/individual/util/util-macros-${version}.tar.xz"
+tarball_sha512="76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb"
 regenerate() {
         true
 }