Browse Source

ibus: Update to 1.5.3 plus fix for vala 0.50

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj 3 years ago
parent
commit
5752f9954e

+ 2 - 2
meta-gnome/recipes-support/ibus/ibus.inc

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
 
-PV = "1.5.22"
+PV = "1.5.23+git${SRCPV}"
 
 DEPENDS = "unicode-ucd"
 
@@ -13,7 +13,7 @@ SRC_URI = " \
     git://github.com/ibus/ibus.git \
     file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
 "
-SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f"
+SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"

+ 3 - 8
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>
  data/dconf/make-dconf-override-db.sh | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
-index 9c650e97..02fbf059 100755
 --- a/data/dconf/make-dconf-override-db.sh
 +++ b/data/dconf/make-dconf-override-db.sh
 @@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
@@ -28,12 +26,9 @@ index 9c650e97..02fbf059 100755
  # in case that schema is not installed on the system
  glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
  
-@@ -46,5 +42,3 @@ for schema in $schemas; do
- done
- 
+@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then
+     umount $TMPDIR/cache/gvfs
+ fi
  rm -rf $TMPDIR
 -
 -kill $DBUS_SESSION_BUS_PID
--- 
-2.20.1
-