[oe-commits] Saul Wold : libgdbus: Fix for glib-2.0 2.32.2

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 0e33eade3fec1d9df052332d37d266405467a354
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0e33eade3fec1d9df052332d37d266405467a354

Author: Saul Wold <sgw at linux.intel.com>
Date:   Fri May  4 17:33:47 2012 -0700

libgdbus: Fix for glib-2.0 2.32.2

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../libgdbus/libgdbus/fix-for-new-glib.patch       |   20 ++++++++++++++++++++
 meta/recipes-support/libgdbus/libgdbus_git.bb      |    5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libgdbus/libgdbus/fix-for-new-glib.patch b/meta/recipes-support/libgdbus/libgdbus/fix-for-new-glib.patch
new file mode 100644
index 0000000..4bd8360
--- /dev/null
+++ b/meta/recipes-support/libgdbus/libgdbus/fix-for-new-glib.patch
@@ -0,0 +1,20 @@
+Fix for glib-2.0 version 2.32.2
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw at linux.intel.com>
+
+
+Index: git/src/debug.h
+===================================================================
+--- git.orig/src/debug.h
++++ git/src/debug.h
+@@ -19,7 +19,7 @@
+  *
+  */
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ //#define DBG(fmt, arg...)  g_debug("%s: " fmt, __FUNCTION__ , ## arg)
+ #define DBG(fmt, arg...)
diff --git a/meta/recipes-support/libgdbus/libgdbus_git.bb b/meta/recipes-support/libgdbus/libgdbus_git.bb
index 67c61cf..474ec28 100644
--- a/meta/recipes-support/libgdbus/libgdbus_git.bb
+++ b/meta/recipes-support/libgdbus/libgdbus_git.bb
@@ -10,9 +10,10 @@ DEPENDS = "glib-2.0 dbus"
 
 SRCREV = "aeab6e3c0185b271ca343b439470491b99cc587f"
 PV = "0.0+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/libgdbus.git;protocol=git"
+SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/libgdbus.git;protocol=git \
+           file://fix-for-new-glib.patch"
 
 S = "${WORKDIR}/git"