diff options
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb | 8 |
2 files changed, 34 insertions, 4 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch new file mode 100644 index 0000000000..2c4ca057f2 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch @@ -0,0 +1,30 @@ +From 8e6d1f590b1cb437dc67c51298ef1722a7266d35 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 25 Jul 2017 18:37:58 -0700 +Subject: [PATCH] dbus-daemon-proxy: Return DBUS_HANDLER_RESULT_NOT_YET_HANDLED + from master_filter_cb() if DBusConnection is null + +So it can be passed on to other handlers since this could +not be handled here + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dbus-daemon-proxy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dbus-daemon-proxy.c b/dbus-daemon-proxy.c +index 009e4fd..f3f0d80 100644 +--- a/dbus-daemon-proxy.c ++++ b/dbus-daemon-proxy.c +@@ -115,7 +115,7 @@ master_filter_cb (DBusConnection *conn, + guint32 serial; + + if (!dbus_conn) +- return; ++ DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (verbose) + g_print ("New message from server: type='%d' path='%s' iface='%s'" +-- +2.13.3 + diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index 4571b447f2..42cd032c22 100644 --- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -6,15 +6,15 @@ SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608" PV = "0.0.0+gitr${SRCPV}" PR = "r1.59" -ASNEEDED_pn-dbus-daemon-proxy = "" - -SRC_URI = "git://git.collabora.co.uk/git/user/alban/dbus-daemon-proxy" +SRC_URI = "git://github.com/alban/dbus-daemon-proxy \ + file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ + " S = "${WORKDIR}/git" inherit pkgconfig do_compile() { - ${CC} ${LDFLAGS} `pkg-config --cflags --libs dbus-glib-1` -o dbus-daemon-proxy dbus-daemon-proxy.c + ${CC} ${CFLAGS} -o dbus-daemon-proxy dbus-daemon-proxy.c `pkg-config --cflags --libs dbus-glib-1` ${LDFLAGS} } do_install() { |