From 759c49bbeb45106327a0e3025cb4e6f5dc193cbf Mon Sep 17 00:00:00 2001
From: pc-heini <admin@pc-heini.de>
Date: Mon, 15 Jun 2026 11:44:10 +0200
Subject: [PATCH] Fix X11 display: share x11 unconditionally (drop
 fallback-x11)

O3DE's bundled Qt only ships the xcb platform plugin, so it needs X11/
XWayland. Using --socket=fallback-x11 alongside --socket=wayland meant X11
was not shared on Wayland sessions, leaving DISPLAY empty and Qt unable to
connect. Share --socket=x11 unconditionally instead.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 org.o3de.O3DE.yaml      | 3 +--
 scripts/make-flatpak.sh | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/org.o3de.O3DE.yaml b/org.o3de.O3DE.yaml
index 8fa94d7a7..11fe19524 100644
--- a/org.o3de.O3DE.yaml
+++ b/org.o3de.O3DE.yaml
@@ -16,8 +16,7 @@ command: o3de-wrapper.sh
 finish-args:
   - --share=ipc
   - --share=network            # Project Manager fetches gems/templates; engine downloads assets
-  - --socket=x11
-  - --socket=fallback-x11
+  - --socket=x11               # O3DE's bundled Qt only ships the xcb plugin, so X11/XWayland is required
   - --socket=wayland
   - --socket=pulseaudio
   - --device=dri               # GPU access for the renderer
diff --git a/scripts/make-flatpak.sh b/scripts/make-flatpak.sh
index 652eae2ef..f467dfc3c 100755
--- a/scripts/make-flatpak.sh
+++ b/scripts/make-flatpak.sh
@@ -51,7 +51,6 @@ flatpak build-finish build-dir \
   --share=ipc \
   --share=network \
   --socket=x11 \
-  --socket=fallback-x11 \
   --socket=wayland \
   --socket=pulseaudio \
   --device=dri \