diff options
| -rw-r--r-- | meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus-glib.inc | 4 |
2 files changed, 23 insertions, 1 deletions
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 0000000000..27780e71da --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | Fix the compiling error that not include glib.h directly. | ||
| 2 | |||
| 3 | upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210 | ||
| 4 | Upstream-Status: Submitted | ||
| 5 | |||
| 6 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
| 7 | |||
| 8 | diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c | ||
| 9 | index 3355890..7291f35 100644 | ||
| 10 | --- a/test/core/test-service-glib.c | ||
| 11 | +++ b/test/core/test-service-glib.c | ||
| 12 | @@ -11,7 +11,7 @@ | ||
| 13 | #include <string.h> | ||
| 14 | #include <glib/gi18n.h> | ||
| 15 | #include <glib-object.h> | ||
| 16 | -#include <glib/gquark.h> | ||
| 17 | +#include <glib.h> | ||
| 18 | |||
| 19 | #include "my-object.h" | ||
| 20 | #include "my-object-subclass.h" | ||
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index da2845af02..f554ce82b1 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" | |||
| 11 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native" | 11 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native" |
| 12 | 12 | ||
| 13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | 13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ |
| 14 | file://no-examples.patch" | 14 | file://no-examples.patch \ |
| 15 | file://test-service-glib-include-glib-only.patch \ | ||
| 16 | " | ||
| 15 | 17 | ||
| 16 | inherit autotools pkgconfig gettext | 18 | inherit autotools pkgconfig gettext |
| 17 | 19 | ||
