From: hschang <chang@dev3>
Date: Wed, 2 Jul 2014 05:19:50 +0000 (+0900)
Subject: [dbus] update to 1.8.2
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=7dea37c67fd76c2b498a141a424c4eaa44a49591;hp=14f3d76a73f47095a8151a479a10ec1f603159ec

[dbus] update to 1.8.2
---

diff --git a/meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch b/meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch
deleted file mode 100644
index 38ab7e2..0000000
--- a/meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a942d1543f4d87db821c5836986129dea79a173d Mon Sep 17 00:00:00 2001
-From: Marc Mutz <marc.mutz@kdab.com>
-Date: Thu, 16 Feb 2012 08:43:40 +0100
-Subject: [PATCH] dbus-protocol.h: compile under C++11
-
-C++11 compilers have a feature called 'user-defined string literals' which
-allow arbitrary string suffixes to have user-defined meaning.
-
-This makes code that concatenates macros with string literals without
-intervening whitespace illegal under C++11. Fortunately, string literal
-concatenation has allowed intervening whitespace since the dawn of time,
-so the solution is to simply pad with spaces.
-
-Tested (header) with GCC 4.7 (trunk).
----
- dbus/dbus-protocol.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
-index 8aa15e5..60605ab 100644
---- a/dbus/dbus-protocol.h
-+++ b/dbus/dbus-protocol.h
-@@ -456,7 +456,7 @@ extern "C" {
- /** XML system identifier of the introspection format version 1.0 */
- #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
- /** XML document type declaration of the introspection format version 1.0 */
--#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n"
-+#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n"
- 
- /** @} */
- 
--- 
-1.7.2.3
-
diff --git a/meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend b/meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend
deleted file mode 100644
index ff7200c..0000000
--- a/meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-PR .= "-dream1"
-
-SRC_URI += "file://compile-under-c++11.patch"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"