Patchwork [v3] dbus-glib: fix compile error when enable-tests

login
register
mail settings
Submitter Yao Zhao
Date July 17, 2012, 8:10 p.m.
Message ID <1342555805-3291-1-git-send-email-yao.zhao@windriver.com>
Download mbox | patch
Permalink /patch/32317/
State Accepted
Commit aefa55f3553f00753d1eb95905086bc12bc5bfaa
Headers show

Comments

Yao Zhao - July 17, 2012, 8:10 p.m.
test-service-glib-include-glib-only.patch: fixes the compiling failure
that test-service-glib.c includes glib/gquark.h not glib.h directly.

[YOCTO #2762]

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
---
 .../test-service-glib-include-glib-only.patch      |   20 ++++++++++++++++++++
 meta/recipes-core/dbus/dbus-glib.inc               |    4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch

Patch

diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
new file mode 100644
index 0000000..27780e7
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
@@ -0,0 +1,20 @@ 
+Fix the compiling error that not include glib.h directly.
+
+upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210
+Upstream-Status: Submitted
+
+Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
+
+diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
+index 3355890..7291f35 100644
+--- a/test/core/test-service-glib.c
++++ b/test/core/test-service-glib.c
+@@ -11,7 +11,7 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <glib-object.h>
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ #include "my-object.h"
+ #include "my-object-subclass.h"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index da2845a..f554ce8 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -11,7 +11,9 @@  DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-           file://no-examples.patch"
+           file://no-examples.patch \
+           file://test-service-glib-include-glib-only.patch \
+"
 
 inherit autotools pkgconfig gettext