From abad9e2dec4e90983724f77df4502891f6965875 Mon Sep 17 00:00:00 2001 From: Levi Neely <141506390+lneely@users.noreply.github.com> Date: Sun, 13 Apr 2025 17:25:38 +0200 Subject: [PATCH] fix build when WSYSTYPE=wayland in local cfg --- src/cmd/fontsrv/freetyperules.sh | 2 +- src/cmd/fontsrv/mkwsysrules.sh | 2 +- src/cmd/fontsrv/wayland.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/cmd/fontsrv/wayland.c diff --git a/src/cmd/fontsrv/freetyperules.sh b/src/cmd/fontsrv/freetyperules.sh index 5ca91573..ed2c9b0e 100644 --- a/src/cmd/fontsrv/freetyperules.sh +++ b/src/cmd/fontsrv/freetyperules.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ "x$1" = "xx11" ]; then +if [ "x$1" = "xx11" -o "x$1" = "xwayland" ]; then if [ "x$2" = "x" ]; then i="-I/usr/include" else diff --git a/src/cmd/fontsrv/mkwsysrules.sh b/src/cmd/fontsrv/mkwsysrules.sh index 1b585c1a..a8cf5954 100644 --- a/src/cmd/fontsrv/mkwsysrules.sh +++ b/src/cmd/fontsrv/mkwsysrules.sh @@ -48,7 +48,7 @@ echo 'WSYSTYPE='$WSYSTYPE echo 'X11='$X11 echo 'X11H='$X11H -if [ $WSYSTYPE = x11 ]; then +if [ $WSYSTYPE = x11 -o $WSYSTYPE = wayland ]; then echo 'CFLAGS=$CFLAGS '$X11H echo 'HFILES=$HFILES $XHFILES' XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` diff --git a/src/cmd/fontsrv/wayland.c b/src/cmd/fontsrv/wayland.c new file mode 100644 index 00000000..53a00c66 --- /dev/null +++ b/src/cmd/fontsrv/wayland.c @@ -0,0 +1 @@ +#include "x11.c"