diff mbox series

[meta-xfce,v2,11/15] xfdesktop: switch to meson build system

Message ID 20260324125927.1070644-12-peng.zhang1.cn@windriver.com
State New
Headers show
Series meta-xfce: upgrade core components to 4.21.x and fix cascading build issues | expand

Commit Message

Zhang Peng March 24, 2026, 12:59 p.m. UTC 
From: Zhang Peng <peng.zhang1.cn@windriver.com>

Switch from autotools to meson build system. The upstream 4.20.1 source
already ships a meson.build.

libxfce4ui 4.21.7 moved libxfce4util-1.0 from Requires to
Requires.private in its pkg-config file, so pkg-config --libs
libxfce4ui-2 no longer emits -lxfce4util. This causes DSO missing
link errors for autotools consumers that use libxfce4util symbols
but rely on libxfce4ui to pull in the link dependency. The meson
build correctly declares libxfce4util in its own dependencies,
avoiding this issue.

Add PACKAGECONFIG[tests] (disabled by default)

Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
---
 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
index a24ed76d53..d16a9e6446 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
@@ -9,7 +9,6 @@  DEPENDS = " \
     garcon \
     glib-2.0 \
     gtk+3 \
-    intltool \
     libwnck3 \
     libxfce4ui \
     libxfce4util \
@@ -18,6 +17,8 @@  DEPENDS = " \
     xfconf \
 "
 
+XFCEBASEBUILDCLASS = "meson"
+
 inherit xfce features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -25,12 +26,7 @@  REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI[sha256sum] = "acccde849265bbf4093925ba847977b7abf70bb2977e4f78216570e887c157b8"
 
 PACKAGECONFIG ??= "notify"
-PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
-
-EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \
-                GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources \
-                GLIB_GENMARSHAL=${STAGING_BINDIR_NATIVE}/glib-genmarshal \
-                GLIB_MKENUMS=${STAGING_BINDIR_NATIVE}/glib-mkenums \
-                "
+PACKAGECONFIG[notify] = "-Dnotifications=enabled,-Dnotifications=disabled,libnotify"
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,"
 
 FILES:${PN} += "${datadir}/backgrounds"