summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-23 14:45:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-24 17:32:56 +0100
commitdfc493ea88153cf9901233353eb5eb161456ec36 (patch)
tree8121d31ff5ba46291a9e14f551ed1b0abfec6e1f
parent2f958cbc30747d41b6861e5281829f348d4f7ab7 (diff)
downloadpoky-dfc493ea88153cf9901233353eb5eb161456ec36.tar.gz
dbus-glib: upgrade to 0.100
test-service-glib-include-glib-only.patch: removed - no more compiling errors Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch (renamed from meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch)0
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch (renamed from meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch)0
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch20
-rw-r--r--meta/recipes-core/dbus/dbus-glib.inc1
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.100.bb6
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.98.bb6
6 files changed, 6 insertions, 27 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch
index fbb4967828..fbb4967828 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch
index 2e8e178bb7..2e8e178bb7 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.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
deleted file mode 100644
index 27780e71da..0000000000
--- a/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Fix the compiling error that not include glib.h directly.
2
3upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210
4Upstream-Status: Submitted
5
6Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
7
8diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
9index 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 a8e6d420f7..3469a4f2b1 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -12,7 +12,6 @@ DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
12 12
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 13SRC_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 file://test-install-makefile.patch \ 15 file://test-install-makefile.patch \
17" 16"
18 17
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.bb b/meta/recipes-core/dbus/dbus-glib_0.100.bb
new file mode 100644
index 0000000000..f96d04e3cc
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.100.bb
@@ -0,0 +1,6 @@
1require dbus-glib.inc
2
3PR = "r0"
4
5SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e"
6SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.98.bb b/meta/recipes-core/dbus/dbus-glib_0.98.bb
deleted file mode 100644
index e2c6a0ccf1..0000000000
--- a/meta/recipes-core/dbus/dbus-glib_0.98.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require dbus-glib.inc
2
3PR = "r1"
4
5SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8"
6SRC_URI[sha256sum] = "297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111"