diff mbox series

[meta-xfce,4/7] xfce4-panel: Remove x11 from REQUIRED_DISTRO_FEATURES

Message ID 20260414075521.91846-4-changqing.li@windriver.com
State Accepted
Headers show
Series [meta-oe,1/7] gtkmm4: remove x11 from REQUIRED_DISTRO_FEATURES | expand

Commit Message

Changqing Li April 14, 2026, 7:55 a.m. UTC 
Dependency on libwnck3 is moved into PACKAGECONFIG, so we can remove x11
from REQUIRED_DISTRO_FEATURES, set ANY_OF_DISTRO_FEATURES

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
index b3cf4b2559..00c9352dec 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
@@ -3,9 +3,7 @@  HOMEPAGE = "https://docs.xfce.org/xfce/xfce4-panel/start"
 SECTION = "x11"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
-DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \
-           libwnck3 vala-native \
-           "
+DEPENDS = "garcon exo cairo libxml2 vala-native gtk+3 libxfce4windowing"
 
 XFCE_COMPRESS_TYPE = "xz"
 XFCEBASEBUILDCLASS = "meson"
@@ -13,8 +11,6 @@  GTKDOC_MESON_OPTION = "gtk-doc"
 
 inherit xfce gtk-doc gobject-introspection features_check mime-xdg
 
-REQUIRED_DISTRO_FEATURES = "x11"
-
 SRC_URI += " \
     file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
     file://0002-use-lxdm-to-replace-dm-tool.patch \
@@ -24,6 +20,12 @@  SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb
 
 EXTRA_OEMESON += "-Dvala=disabled"
 
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[x11] = "-Dx11=enabled, -Dx11=disabled, virtual/libx11 libwnck3 libxext"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled, wayland wayland-native wayland-protocols"
+
 python populate_packages:prepend() {
     plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')
     plugin_name = d.expand('${PN}-plugin-%s')