From fa619ffa3a7485efb1493a8e8f79bce42b62c620 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Thu, 28 May 2026 16:36:45 +0800 Subject: [PATCH 6/8] xquartz: xpr: support pre-10.6 versions of Xplugin See: https://github.com/XQuartz/xorg-server/blob/16f52e51a203bdb90de5d94478aa9bca4e9c2e67/hw/xquartz/xpr/xprAppleWM.c#L149-L158 --- hw/xquartz/xpr/xprAppleWM.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c index ed031d228..51343bf13 100644 --- a/hw/xquartz/xpr/xprAppleWM.c +++ b/hw/xquartz/xpr/xprAppleWM.c @@ -80,6 +80,7 @@ xprSetWindowLevel(WindowPtr pWin, int level) return Success; } +#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) { @@ -111,6 +112,7 @@ xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) return Success; } +#endif static int xprFrameDraw(WindowPtr pWin, @@ -142,8 +144,16 @@ static AppleWMProcsRec xprAppleWMProcs = { xp_frame_get_rect, xp_frame_hit_test, xprFrameDraw, +#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 xp_set_dock_proxy, xprAttachTransient +#elif defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 2 + xp_set_dock_proxy, + NULL +#else + NULL, + NULL +#endif }; void -- 2.54.0