Skip to contentSkip to conversation

mdbus2: Fix build with vala 0.50

PATCH New Khem Raj 1 participant 2 messages Nov 3, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 mdbus2: Fix build with vala 0.50

---
 ...-GLib.DBusSignalCallback-for-Vala-0..patch | 27 +++++++++++++++++++
 meta-oe/recipes-core/mdbus2/mdbus2_git.bb     |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch
meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch new file +27 -0
new file mode 100644
index 0000000000..65df09b1bc
@@ -0,0 +1,27 @@
+From 01a3a35631ba3996f7e912def66b4053a4f21df9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 3 Nov 2020 10:52:17 -0800
+Subject: [PATCH] Fix arguments in GLib.DBusSignalCallback for Vala 0.50
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/main.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 6d7132b0..b3183217 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -403,7 +403,7 @@ class Commands : Object
+         return false;
+     }
+ 
+-    public void signalHandler( GLib.DBusConnection conn, string sender, string path, string iface, string name, Variant params )
++    public void signalHandler( GLib.DBusConnection conn, string? sender, string path, string iface, string name, Variant params )
+     {
+         var line = "[SIGNAL] %s.%s  %s  %s\n%s".printf(
+           iface,
+-- 
+2.29.2
+
meta-oe/recipes-core/mdbus2/mdbus2_git.bb +3 -1
index 82f2cf8c94..71ab4d45a7 100644
@@ -6,7 +6,9 @@ DEPENDS = "readline"
 
 PV = "2.3.3+git${SRCPV}"
 
-SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http"
+SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http \
+           file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \
+           "
 SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH 2/2 ibus: Update to 1.5.3 plus fix for vala 0.50

---
 meta-gnome/recipes-support/ibus/ibus.inc              |  4 ++--
 ...-try-to-start-dbus-we-do-not-have-dbus-lauch.patch | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)
meta-gnome/recipes-support/ibus/ibus.inc +2 -2
index 1bbeb2c481..ea413cf4bd 100644
@@ -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"
meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch +3 -8
index 3701d19f5c..aec9e7abec 100644
@@ -13,8 +13,6 @@ Signed-off-by: Andreas Müller <[email protected]>
  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
-
Signature · 1 line
2.29.2