From 923b1308e1d36a8959234cc6a5671ff7da828df7 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <vital.had@gmail.com>
Date: Thu, 28 May 2026 16:19:00 +0800
Subject: [PATCH 4/8] os/client.c: portability fix: use generic code on macOS
 10.5

Older xquartz used generic code for macOS, so use it now if no dispatch available.
See: https://github.com/XQuartz/xorg-server/blob/16f52e51a203bdb90de5d94478aa9bca4e9c2e67/os/client.c
---
 os/client.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/os/client.c b/os/client.c
index c023027ed..ae37bdbfd 100644
--- a/os/client.c
+++ b/os/client.c
@@ -75,15 +75,16 @@
 #include <limits.h>
 #endif
 
-#if defined(__DragonFly__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__)
 #include <sys/sysctl.h>
 #include <errno.h>
 #endif
 
 #ifdef __APPLE__
+#include "hw/xquartz/osxcompat.h"
+#ifdef HAS_LIBDISPATCH
 #include <dispatch/dispatch.h>
-#include <errno.h>
-#include <sys/sysctl.h>
+#endif
 #endif
 
 #include "os/auth.h"
@@ -165,7 +166,7 @@ get_argmax_from_kern(void *arg)
 void
 DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
 {
-#if !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
+#if !(defined(__APPLE__) && defined(HAS_LIBDISPATCH)) && !defined(__DragonFly__) && !defined(__FreeBSD__)
     char path[PATH_MAX + 1];
     int totsize = 0;
     int fd = 0;
@@ -179,7 +180,7 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
     if (pid == -1)
         return;
 
-#if defined (__APPLE__)
+#if defined(__APPLE__) && defined(HAS_LIBDISPATCH)
     {
         static dispatch_once_t once;
         static int argmax;
-- 
2.54.0