ibus: merge bb/inc

Now that ibus-native doesn't exist, there's no need to have split .bb
and .inc files.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>

meta-gnome/recipes-support/ibus/ibus.bb

@@ -1,41 +0,0 @@
-require ${BPN}.inc
-
-DEPENDS += " \
-    glib-2.0-native \
-    glib-2.0 \
-    dbus \
-    iso-codes \
-"
-
-inherit gtk-icon-cache bash-completion features_check
-
-# for unicode-ucd
-EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd"
-
-PACKAGECONFIG ??= " \
-    dconf vala \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libnotify', '', d)} \
-"
-
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}"
-
-do_compile:prepend() {
-    export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
-}
-
-FILES:${PN} += " \
-    ${datadir}/dbus-1 \
-    ${datadir}/GConf \
-    ${datadir}/glib-2.0 \
-    ${libdir}/gtk-2.0 \
-    ${libdir}/gtk-3.0 \
-    ${libdir}/gtk-4.0 \
-    ${systemd_user_unitdir} \
-"
-
-FILES:${PN}-dev += " \
-    ${datadir}/gettext \
-"
-RDEPENDS:${PN} += "python3-core"

meta-gnome/recipes-support/ibus/ibus_1.5.34.bb

@@ -3,11 +3,7 @@ HOMEPAGE = "https://github.com/ibus/ibus/wiki"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
-
-PV = "1.5.34"
-
-DEPENDS = "unicode-ucd libx11-native"
+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} \
@@ -17,6 +13,16 @@ SRC_URI = " \
 "
 SRCREV = "1f7af28437afd62a6d145bfc81035e698a37411d"
 
+# brokensep needed as vapi fails to build correctly
+inherit autotools-brokensep gettext features_check pkgconfig
+inherit bash-completion gobject-introspection gtk-doc gtk-icon-cache vala
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libnotify', '', d)} \
+    dconf vala \
+"
 PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
 PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
 PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
@@ -32,18 +38,35 @@ EXTRA_OECONF = " \
     --disable-tests \
     --disable-emoji-dict \
     --disable-python2 \
-"
-EXTRA_OECONF:append:class-target = "\
     --with-python=${bindir}/python3 \
+    --with-ucd-dir=${STAGING_DATADIR}/unicode/ucd \
 "
 
 do_configure:prepend() {
-    touch ${S}/ChangeLog
-    touch ${S}/ABOUT-NLS
+    touch ${S}/ChangeLog ${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
 }
 
 do_compile:prepend() {
+    export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
     cp ${STAGING_DATADIR_NATIVE}/X11/locale/en_US.UTF-8/Compose ${B}/src/Compose
 }
+
+FILES:${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/GConf \
+    ${datadir}/glib-2.0 \
+    ${libdir}/gtk-2.0 \
+    ${libdir}/gtk-3.0 \
+    ${libdir}/gtk-4.0 \
+    ${systemd_user_unitdir} \
+"
+
+FILES:${PN}-dev += " \
+    ${datadir}/gettext \
+"
+
+RDEPENDS:${PN} += "python3-core"
+
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}"