From 7e74f85c32686a6c456d4978430de35751d6cefd Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Fri, 20 Feb 2026 16:07:58 +0100
Subject: [PATCH] Use external libdisplay-info with Xfce, add Wayland build dep
 to VTE

---
 easybuild/easyconfigs/v/VTE/VTE-0.82.2-GCCcore-14.3.0.eb | 4 ++++
 easybuild/easyconfigs/x/Xfce/Xfce-4.20-GCCcore-14.3.0.eb | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/easybuild/easyconfigs/v/VTE/VTE-0.82.2-GCCcore-14.3.0.eb b/easybuild/easyconfigs/v/VTE/VTE-0.82.2-GCCcore-14.3.0.eb
index 57494a75840d..95e82f90ea39 100644
--- a/easybuild/easyconfigs/v/VTE/VTE-0.82.2-GCCcore-14.3.0.eb
+++ b/easybuild/easyconfigs/v/VTE/VTE-0.82.2-GCCcore-14.3.0.eb
@@ -19,6 +19,10 @@ builddependencies = [
     ('Ninja', '1.13.0'),
     ('CMake', '4.0.3'),
     ('Vala', '0.56.18'),
+    # VTE has a transitive dep on a header from Wayland via GT4
+    # Due to https://github.com/easybuilders/easybuild-framework/issues/5124
+    # this can get lost in some EasyBuild configurations
+    ('Wayland', '1.24.0'),
 ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/Xfce/Xfce-4.20-GCCcore-14.3.0.eb b/easybuild/easyconfigs/x/Xfce/Xfce-4.20-GCCcore-14.3.0.eb
index 29c8cd121d82..7cbd60b5e16d 100644
--- a/easybuild/easyconfigs/x/Xfce/Xfce-4.20-GCCcore-14.3.0.eb
+++ b/easybuild/easyconfigs/x/Xfce/Xfce-4.20-GCCcore-14.3.0.eb
@@ -38,6 +38,7 @@ dependencies = [
     ('GST-plugins-bad', '1.26.6'),  # parole
     ('GtkSourceView4', '4.8.4'),  # mousepad
     ('VTE', '0.82.2'),  # xfce4-terminal
+    ('libdisplay-info', '0.3.0')  # Required for X11 support in libxfce4windowing
 ]
 
 default_easyblock = 'ConfigureMake'
@@ -54,12 +55,6 @@ default_component_specs = {
 }
 
 components = [
-    ('libdisplay-info', '0.3.0', {  # Required for X11 support in libxfce4windowing
-        'easyblock': 'MesonNinja',
-        'source_urls': ['https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/%(version)s/downloads/'],
-        'sources': [SOURCELOWER_TAR_XZ],
-        'checksums': ['6ae77cd937f9cf7d1321d35c116062c4911e8447010a6a713ac4286f7a9d5987'],
-    }),
     ('xfce4-dev-tools', version + '.0', {
         'checksums': ['1fba39a08a0ecc771eaa3a3b6e4272a4f0b9e7c67d0f66e780cd6090cd4466aa'],
     }),