From 85b04a5bfd6d31e349df344e0935f95183267bed Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 18 Jun 2025 16:52:17 -0600
Subject: [PATCH] libxkbcommon: compile dynamically

---
 .../wip/libs/other/libxkbcommon/recipe.toml   | 44 +------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

diff --git a/recipes/wip/libs/other/libxkbcommon/recipe.toml b/recipes/wip/libs/other/libxkbcommon/recipe.toml
index 9fc3ebf51..119193b0e 100644
--- a/recipes/wip/libs/other/libxkbcommon/recipe.toml
+++ b/recipes/wip/libs/other/libxkbcommon/recipe.toml
@@ -1,4 +1,3 @@
-#TODO missing script for Meson, see https://github.com/xkbcommon/libxkbcommon#building
 [source]
 tar = "https://xkbcommon.org/download/libxkbcommon-1.7.0.tar.xz"
 b3sum = "5001ca0b8562feeef2010bf16c05657e3875fda3ed5fdedbf48b9135e5cdfcbc"
@@ -11,47 +10,8 @@ dependencies = [
     "zlib",
 ]
 script = """
-# TODO: Fix this annoying shite
-echo "[binaries]" > cross_file.txt
-echo "c = '${CC}'" >> cross_file.txt
-echo "cpp = '${CXX}'" >> cross_file.txt
-echo "ar = '${AR}'" >> cross_file.txt
-echo "strip = '${STRIP}'" >> cross_file.txt
-echo "pkgconfig = '${TARGET}-pkg-config'" >> cross_file.txt
-
-echo "[host_machine]" >> cross_file.txt
-echo "system = 'redox'" >> cross_file.txt
-echo "cpu_family = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
-echo "cpu = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
-echo "endian = 'little'" >> cross_file.txt
-
-echo "[paths]" >> cross_file.txt
-echo "prefix = '${COOKBOOK_SYSROOT}'" >> cross_file.txt
-echo "libdir = 'lib'" >> cross_file.txt
-echo "bindir = 'bin'" >> cross_file.txt
-
-unset AR
-unset AS
-unset CC
-unset CXX
-unset LD
-unset NM
-unset OBJCOPY
-unset OBJDUMP
-unset PKG_CONFIG
-unset RANLIB
-unset READELF
-unset STRIP
-
-meson setup "${COOKBOOK_SOURCE}" _build \
-	--cross-file cross_file.txt \
-	--buildtype release \
-	--strip \
-	-Ddefault_library=static \
-	-Dprefix=/ \
-	-Dlibdir=lib \
+DYNAMIC_INIT
+cookbook_meson \
     -Denable-wayland=false \
     -Denable-x11=false
-ninja -C _build -v
-DESTDIR="${COOKBOOK_STAGE}" ninja -C _build -v install
 """