diff mbox series

[meta-gnome,1/2] ibus: remove bundled vapigen.m4 again

Message ID 20260924003841.1113450-1-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-gnome,1/2] ibus: remove bundled vapigen.m4 again | expand

Commit Message

Khem Raj Sept. 24, 2026, 12:38 a.m. UTC
Commit c175507f1c ("classes/vala: remove obsolete logic") dropped the
removal of vapigen.m4 bundled with sources

That macro does prefix the paths it reads from vapigen.pc with
PKG_CONFIG_SYSROOT_DIR, but older copies bundled by projects such as
ibus do not, and since these are found first via ACLOCAL_AMFLAGS = -I m4
they take precedence.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 meta-gnome/recipes-support/ibus/ibus.inc | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
index 9ec1dfe578..1344cb1981 100644
--- a/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -40,4 +40,6 @@  EXTRA_OECONF:append:class-target = "\
 do_configure:prepend() {
     touch ${S}/ChangeLog
     touch ${S}/ABOUT-NLS
+    # Remove vapigen.m4 bundled with sources so that the one shipped by vala is used instead.
+    rm -f ${S}/m4/vapigen.m4
 }