diff mbox series

[meta-xfce,14/15] xfce4-datetime-setter: fix link failure due to missing libxfce4util dependency

Message ID 20260323114152.4178269-15-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 23, 2026, 11:41 a.m. UTC 
From: Zhang Peng <peng.zhang1.cn@windriver.com>

After libxfce4ui upgrade to 4.21.x, its pkgconfig sets
libxfce4util as Requires.private, so the linker no longer
automatically pulls in libxfce4util. This causes an undefined
reference to 'xfce_textdomain' when linking xfce4-datetime-settings.

Add patch for libxfce4util-1.0 and common_deps (gtk+-3.0 etc.) as explicit
dependencies in xfce/meson.build.

Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
---
 ...g-direct-dependencies-to-fix-link-fa.patch | 35 +++++++++++++++++++
 .../xfce4-datetime-setter_3.32.2.bb           |  6 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-build-add-missing-direct-dependencies-to-fix-link-fa.patch
diff mbox series

Patch

diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-build-add-missing-direct-dependencies-to-fix-link-fa.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-build-add-missing-direct-dependencies-to-fix-link-fa.patch
new file mode 100644
index 0000000000..c86e418800
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-build-add-missing-direct-dependencies-to-fix-link-fa.patch
@@ -0,0 +1,35 @@ 
+From 57fc1ba0b433f2f95cd9eb011cf64a4f28b281b4 Mon Sep 17 00:00:00 2001
+From: Zhang Peng <peng.zhang1.cn@windriver.com>
+Date: Mon, 23 Mar 2026 16:44:28 +0800
+Subject: [PATCH] build: add missing direct dependencies to fix link failures
+
+xfce/ sources directly call symbols from libxfce4util (xfce_textdomain)
+and gtk+-3.0 (gtk_builder_*, gtk_combo_box_*, gtk_widget_*), but only
+libxfce4ui-2 was listed as a dependency. Since libxfce4ui-2 correctly
+places these in Requires.private, the client must declare its own direct
+dependencies.
+
+Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/4]
+
+Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
+---
+ xfce/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xfce/meson.build b/xfce/meson.build
+index 2acab2f..f1386a5 100644
+--- a/xfce/meson.build
++++ b/xfce/meson.build
+@@ -7,8 +7,9 @@ xfce_datetime_c_args = [
+   '-DHAVE_CONFIG_H',
+ ]
+
+-xfce_datetime_deps = [
++xfce_datetime_deps = common_deps + [
+   libxfce4ui_dep,
++  dependency('libxfce4util-1.0'),
+ ]
+
+ resource_data = files(
+--
+2.50.0
diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
index 308da40c34..356c55e47b 100644
--- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
@@ -6,10 +6,12 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 
 DEPENDS = "glib-2.0-native libxfce4ui"
 
-SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \
+SRC_URI = "\
+           git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \
            file://fix-inner-dependency.patch \
            file://0001-Fix-build-with-meson-0.61.patch \
-"
+           file://0001-build-add-missing-direct-dependencies-to-fix-link-fa.patch \
+           "
 SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f"