summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-05-04 17:33:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-06 10:21:18 +0100
commit0e33eade3fec1d9df052332d37d266405467a354 (patch)
tree20759406de8465dfa8ea5af4cb866655d3a1a7db
parent155ea975f5e0287f9ed49413785d1948c56601a5 (diff)
downloadopenembedded-core-0e33eade3fec1d9df052332d37d266405467a354.tar.gz
openembedded-core-0e33eade3fec1d9df052332d37d266405467a354.tar.bz2
openembedded-core-0e33eade3fec1d9df052332d37d266405467a354.zip
libgdbus: Fix for glib-2.0 2.32.2
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-support/libgdbus/libgdbus/fix-for-new-glib.patch20
-rw-r--r--meta/recipes-support/libgdbus/libgdbus_git.bb5
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 0000000000..4bd836062f
--- /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@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 67c61cf3dc..474ec2852d 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"