mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-12 15:31:03 +00:00
ibus: Fix build without x11
The upgrade to 1.5.35 made ibus depend on the target libx11 for the X11 compose data that the compose table is generated from, so ibus, and with it gnome-shell and gnome-control-center, can no longer be built without x11: ERROR: Nothing PROVIDES 'libx11' (but .../ibus_1.5.35.bb DEPENDS on or otherwise requires it) The compose table is also used without X11. gen-internal-compose-table reads ./Compose first, so copy it from libx11-native like before the switch to meson. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 file changed
+7
-1
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ibus/ibus/wiki"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
|
||||
|
||||
DEPENDS = "unicode-ucd libx11 glib-2.0-native glib-2.0 dbus iso-codes"
|
||||
DEPENDS = "unicode-ucd libx11-native glib-2.0-native glib-2.0 dbus iso-codes"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/ibus/ibus.git;branch=main;protocol=https;tag=${PV} \
|
||||
@@ -40,6 +40,12 @@ EXTRA_OEMESON = " \
|
||||
-Ducd-dir=${STAGING_DATADIR}/unicode/ucd \
|
||||
"
|
||||
|
||||
# gen-internal-compose-table reads ./Compose before the X11 locale data,
|
||||
# which is not in the sysroot without x11
|
||||
do_compile:prepend() {
|
||||
cp ${STAGING_DATADIR_NATIVE}/X11/locale/en_US.UTF-8/Compose ${B}/Compose
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
sed -i -e 's|${PYTHON}|${bindir}/python3|' ${D}${bindir}/ibus-setup
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user