diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-03 10:55:53 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-03 11:03:45 -0800 |
commit | 5752f9954e294a135905be8e38800087a685169b (patch) | |
tree | e91f71894a0c21c7a1c5a874a97e1442cb494dec | |
parent | 33f7a3b3a10b0af4a900af4b40d2e9c6974aefe9 (diff) | |
download | meta-openembedded-5752f9954e294a135905be8e38800087a685169b.tar.gz |
ibus: Update to 1.5.3 plus fix for vala 0.50
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-support/ibus/ibus.inc | 4 | ||||
-rw-r--r-- | meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index 1bbeb2c481..ea413cf4bd 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 | ||
6 | inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala | 6 | inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala |
7 | 7 | ||
8 | PV = "1.5.22" | 8 | PV = "1.5.23+git${SRCPV}" |
9 | 9 | ||
10 | DEPENDS = "unicode-ucd" | 10 | DEPENDS = "unicode-ucd" |
11 | 11 | ||
@@ -13,7 +13,7 @@ SRC_URI = " \ | |||
13 | git://github.com/ibus/ibus.git \ | 13 | git://github.com/ibus/ibus.git \ |
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 | " |
16 | SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f" | 16 | SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" |
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" | 19 | PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" |
diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch index 3701d19f5c..aec9e7abec 100644 --- a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch +++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch | |||
@@ -13,8 +13,6 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
13 | data/dconf/make-dconf-override-db.sh | 6 ------ | 13 | data/dconf/make-dconf-override-db.sh | 6 ------ |
14 | 1 file changed, 6 deletions(-) | 14 | 1 file changed, 6 deletions(-) |
15 | 15 | ||
16 | diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh | ||
17 | index 9c650e97..02fbf059 100755 | ||
18 | --- a/data/dconf/make-dconf-override-db.sh | 16 | --- a/data/dconf/make-dconf-override-db.sh |
19 | +++ b/data/dconf/make-dconf-override-db.sh | 17 | +++ b/data/dconf/make-dconf-override-db.sh |
20 | @@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" | 18 | @@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" |
@@ -28,12 +26,9 @@ index 9c650e97..02fbf059 100755 | |||
28 | # in case that schema is not installed on the system | 26 | # in case that schema is not installed on the system |
29 | glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" | 27 | glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" |
30 | 28 | ||
31 | @@ -46,5 +42,3 @@ for schema in $schemas; do | 29 | @@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then |
32 | done | 30 | umount $TMPDIR/cache/gvfs |
33 | 31 | fi | |
34 | rm -rf $TMPDIR | 32 | rm -rf $TMPDIR |
35 | - | 33 | - |
36 | -kill $DBUS_SESSION_BUS_PID | 34 | -kill $DBUS_SESSION_BUS_PID |
37 | -- | ||
38 | 2.20.1 | ||
39 | |||