dbus-c++: update to latest SRCREV

* convert to BBCLASSEXTEND and remove -native as it has
  staged the wrapper script instead of the binary

Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>

diff --git a/recipes/dbus/dbus-c++-native_git.bb b/recipes/dbus/dbus-c++-native_git.bb
deleted file mode 100644 (file)
index eba80b2..0000000
--- a/recipes/dbus/dbus-c++-native_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require dbus-c++_git.bb
-inherit native
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
-# actually dbus-native and expat-native, but even the bearest build machine should have that nowadays...
-DEPENDS = ""
-
-do_compile() {
-       oe_runmake -C src libdbus-c++-1.la
-       oe_runmake -C tools dbusxx-xml2cpp
-       install -m 0755 tools/dbusxx-xml2cpp ${STAGING_BINDIR_NATIVE}
-}
-
-do_install() {
-       :
-}
-

diff --git a/recipes/dbus/dbus-c++/fix-linking.patch b/recipes/dbus/dbus-c++/fix-linking.patch
deleted file mode 100644 (file)
index 8222169..0000000
--- a/recipes/dbus/dbus-c++/fix-linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus/tools/Makefile.am
-===================================================================
---- dbus.orig/tools/Makefile.am
-+++ dbus/tools/Makefile.am
-@@ -16,7 +16,7 @@ endif
- bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
- 
- dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp
--dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la)
-+dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -lexpat
- 
- dbusxx_introspect_SOURCES = introspect.h introspect.cpp
- dbusxx_introspect_LDADD = $(libdbus_cxx_la)

diff --git a/recipes/dbus/dbus-c++_git.bb b/recipes/dbus/dbus-c++_git.bb
index 6459823..07b4eec 100644 (file)
--- a/recipes/dbus/dbus-c++_git.bb
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -1,23 +1,20 @@
 DESCRIPTION = "C++ bindings for dbus"
 LICENSE = "LGPLv2.1+"
 SECTION = "libs"
-DEPENDS = "dbus dbus-c++-native expat"
-SRCREV = "530a887913d3b0dd7091eabb8eef8e3c279e3bb8"
+DEPENDS = "dbus expat"
+SRCREV = "9e25833870ed8281fab00d7f9eac5755c6798c57"
 
 PE = "1"
-PV = "0.5.0+gitr${SRCPV}"
+PV = "0.6.0-pre1+gitr${SRCPV}"
 
 SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
-#           file://fix-linking.patch"
+
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-do_compile_prepend() {
-       find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,'
-}
-
 FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect"
 FILES_${PN}-dev += "${bindir}/.dev"
 FILES_${PN} = "${libdir}/*.so.*"
 
+BBCLASSEXTEND = "native"
\ No newline at end of file