xquartz: fix incomplete prototype of executable_path()

> ../hw/xquartz/mach-startup/bundle_trampoline.c:53:29: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> static char *executable_path() {
>                             ^
>                              void
> 1 warning generated.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/namespace/hook-windowproperty.c

@@ -11,6 +11,14 @@
 #include "namespace.h"
 #include "hooks.h"
 
+static inline Bool winIsRoot(WindowPtr pWin) {
+    if (!pWin)
+        return FALSE;
+    if (pWin->drawable.pScreen->root == pWin)
+        return TRUE;
+    return FALSE;
+}
+
 void hookWindowProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XNS_HOOK_HEAD(PropertyFilterParam);

hw/kdrive/ephyr/ephyrinit.c

@@ -370,23 +370,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     return KdProcessArgument(argc, argv, i);
 }
 
-static int
-EphyrInit(void)
-{
-    /*
-     * make sure at least one screen
-     * has been added to the system.
-     */
-    if (!KdCardInfoLast()) {
-        processScreenArg("640x480", NULL);
-    }
-    return hostx_init();
-}
-
-KdOsFuncs EphyrOsFuncs = {
-    .Init = EphyrInit,
-};
-
 void
 OsVendorInit(void)
 {
@@ -398,7 +381,12 @@ OsVendorInit(void)
     if (hostx_want_host_cursor())
         ephyrFuncs.initCursor = &ephyrCursorInit;
 
-    KdOsInit(&EphyrOsFuncs);
+    if (serverGeneration == 1) {
+        if (!KdCardInfoLast()) {
+            processScreenArg("640x480", NULL);
+        }
+        hostx_init();
+    }
 }
 
 KdCardFuncs ephyrFuncs = {

hw/kdrive/src/kdrive.c

@@ -91,14 +91,6 @@ const char *kdGlobalXkbLayout = NULL;
 const char *kdGlobalXkbVariant = NULL;
 const char *kdGlobalXkbOptions = NULL;
 
-
-/*
- * Carry arguments from InitOutput through driver initialization
- * to KdScreenInit
- */
-
-KdOsFuncs *kdOsFuncs = NULL;
-
 void
 KdDisableScreen(ScreenPtr pScreen)
 {
@@ -525,19 +517,6 @@ KdProcessArgument(int argc, char **argv, int i)
     return 0;
 }
 
-void
-KdOsInit(KdOsFuncs * pOsFuncs)
-{
-    kdOsFuncs = pOsFuncs;
-    if (pOsFuncs) {
-        if (serverGeneration == 1) {
-            KdDoSwitchCmd("start");
-            if (pOsFuncs->Init)
-                (*pOsFuncs->Init) ();
-        }
-    }
-}
-
 static Bool
 KdAllocatePrivates(ScreenPtr pScreen)
 {

hw/kdrive/src/kdrive.h

@@ -278,16 +278,6 @@ int KdAddConfigKeyboard(char *pointer);
 int KdAddKeyboard(KdKeyboardInfo * ki);
 void KdRemoveKeyboard(KdKeyboardInfo * ki);
 
-typedef struct _KdOsFuncs {
-    int (*Init) (void); /* Only called when the X server is started, when serverGeneration == 1 */
-    void (*Enable) (void);
-    Bool (*SpecialKey) (KeySym);
-    void (*Disable) (void);
-    void (*Fini) (void);
-    void (*pollEvents) (void);
-    void (*Bell) (int, int, int);
-} KdOsFuncs;
-
 typedef struct _KdPointerMatrix {
     int matrix[2][3];
 } KdPointerMatrix;
@@ -299,8 +289,6 @@ extern DevPrivateKeyRec kdScreenPrivateKeyRec;
 extern Bool kdEmulateMiddleButton;
 extern Bool kdDisableZaphod;
 
-extern KdOsFuncs *kdOsFuncs;
-
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
     dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
 #define KdSetScreenPriv(pScreen,v) \
@@ -357,9 +345,6 @@ void
 int
  KdProcessArgument(int argc, char **argv, int i);
 
-void
- KdOsInit(KdOsFuncs * pOsFuncs);
-
 void
  KdOsAddInputDrivers(void);
 

hw/vfb/InitOutput.c

@@ -259,6 +259,13 @@ ddxGiveUp(enum ExitCode error)
     }
 }
 
+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {

hw/xnest/Init.c

@@ -154,6 +154,13 @@ ddxGiveUp(enum ExitCode error)
     xnestCloseDisplay();
 }
 
+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {

hw/xquartz/applewm.c

@@ -690,6 +690,7 @@ SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to)
 static int
 SProcAppleWMQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleWMQueryVersionReq);
     return ProcAppleWMQueryVersion(client);
 }
 

hw/xquartz/xpr/appledri.c

@@ -394,6 +394,7 @@ SNotifyEvent(xAppleDRINotifyEvent *from,
 static int
 SProcAppleDRIQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleDRIQueryVersionReq);
     return ProcAppleDRIQueryVersion(client);
 }
 

meson.build

@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '25.0.0.4',
+        version: '25.0.0.3',
         meson_version: '>= 0.58.0',
 )
-release_date = '2025-07-04'
+release_date = '2025-07-02'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')