From 98ce6f6f281a8b8001d967bafd3debe8ea4db4fa Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 5 Nov 2026 02:35:16 +0100
Subject: [PATCH] =?UTF-8?q?HACK=20xaverius:=20Phase=20A=20C7=20fix=20?=
 =?UTF-8?q?=E2=80=94=20resource=20types=20before=20registration,=20init=20?=
 =?UTF-8?q?symbol=20declared?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Call xaverius_device_init() before XaveriusRegistryInit() so DIX
  resource types exist before AddResource (C7)
- Call xaverius_device_fini() in xaverius_extension_fini() for symmetry
- Declare XaveriusExtensionInit() in xaverius.h (symbol consistency)
- Build clean (-Dwerror, no warnings)
---
 Xext/xaverius/xaverius.c | 1 +
 Xext/xaverius/xaverius.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Xext/xaverius/xaverius.c b/Xext/xaverius/xaverius.c
index 0b54a1f7e3..ece77ae4aa 100644
--- a/Xext/xaverius/xaverius.c
+++ b/Xext/xaverius/xaverius.c
@@ -50,4 +50,5 @@ void
 xaverius_extension_fini(void)
 {
     XaveriusRegistryFini();
+    xaverius_device_fini();
 }
diff --git a/Xext/xaverius/xaverius.h b/Xext/xaverius/xaverius.h
index f18076e36f..dbdb939fb5 100644
--- a/Xext/xaverius/xaverius.h
+++ b/Xext/xaverius/xaverius.h
@@ -280,6 +280,8 @@ typedef struct _XaveriusMemoryRec {
 void xaverius_extension_init(void);
 void xaverius_extension_fini(void);
 
+void XaveriusExtensionInit(void);
+
 int ProcXAveriusDispatch(ClientPtr client);
 int SProcXAveriusDispatch(ClientPtr client);