summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-support/ibus/ibus.bb6
-rw-r--r--meta-gnome/recipes-support/ibus/ibus.inc6
2 files changed, 8 insertions, 4 deletions
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
index 2d733ce53e..be43d0d500 100644
--- a/meta-gnome/recipes-support/ibus/ibus.bb
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -15,8 +15,8 @@ EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd"
15 15
16PACKAGECONFIG ??= " \ 16PACKAGECONFIG ??= " \
17 dconf vala \ 17 dconf vala \
18 ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ 18 ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \
19 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ 19 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
20" 20"
21 21
22do_configure:prepend() { 22do_configure:prepend() {
@@ -29,6 +29,8 @@ FILES:${PN} += " \
29 ${datadir}/GConf \ 29 ${datadir}/GConf \
30 ${datadir}/glib-2.0 \ 30 ${datadir}/glib-2.0 \
31 ${libdir}/gtk-3.0 \ 31 ${libdir}/gtk-3.0 \
32 ${libdir}/gtk-4.0 \
33 ${systemd_user_unitdir} \
32" 34"
33 35
34FILES:${PN}-dev += " \ 36FILES:${PN}-dev += " \
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
index 23f565f661..37a490abe0 100644
--- a/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
5 5
6inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala 6inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
7 7
8PV = "1.5.23+git${SRCPV}" 8PV = "1.5.26"
9 9
10DEPENDS = "unicode-ucd" 10DEPENDS = "unicode-ucd"
11 11
@@ -13,13 +13,15 @@ SRC_URI = " \
13 git://github.com/ibus/ibus.git;branch=master;protocol=https \ 13 git://github.com/ibus/ibus.git;branch=master;protocol=https \
14 file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ 14 file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
15" 15"
16SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" 16SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3"
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
19PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" 19PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
20PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" 20PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
21PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" 21PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
22PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" 22PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
23PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4"
24PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd"
23PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" 25PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
24PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" 26PACKAGECONFIG[vala] = "--enable-vala,--disable-vala"
25PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" 27PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11"