From 44b961e5b6255a5c912bc59144fd6fd14445825c Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <ml@vdm-design.de>
Date: Mon, 19 Apr 2010 20:22:33 +0200
Subject: dbus-c++: dev.openwengo.org is gone

* add patch as anounced on ML 10 days ago
* switch host to new git repo
* define correct verion
* bump PE because no PV was defined before

Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
---
 recipes/dbus/dbus-c++-native_git.bb | 21 +++++++++++++++++++++
 recipes/dbus/dbus-c++-native_svn.bb | 21 ---------------------
 recipes/dbus/dbus-c++_git.bb        | 23 +++++++++++++++++++++++
 recipes/dbus/dbus-c++_svn.bb        | 20 --------------------
 4 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 recipes/dbus/dbus-c++-native_git.bb
 delete mode 100644 recipes/dbus/dbus-c++-native_svn.bb
 create mode 100644 recipes/dbus/dbus-c++_git.bb
 delete mode 100644 recipes/dbus/dbus-c++_svn.bb

diff --git a/recipes/dbus/dbus-c++-native_git.bb b/recipes/dbus/dbus-c++-native_git.bb
new file mode 100644
index 0000000000..dd43f911fe
--- /dev/null
+++ b/recipes/dbus/dbus-c++-native_git.bb
@@ -0,0 +1,21 @@
+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_stage() {
+    autotools_stage_all
+}
+
+do_install() {
+	:
+}
+
diff --git a/recipes/dbus/dbus-c++-native_svn.bb b/recipes/dbus/dbus-c++-native_svn.bb
deleted file mode 100644
index 5599aeb1d2..0000000000
--- a/recipes/dbus/dbus-c++-native_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require dbus-c++_${PV}.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_stage() {
-    autotools_stage_all
-}
-
-do_install() {
-	:
-}
-
diff --git a/recipes/dbus/dbus-c++_git.bb b/recipes/dbus/dbus-c++_git.bb
new file mode 100644
index 0000000000..06e1cb386b
--- /dev/null
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "C++ bindings for dbus"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "dbus dbus-c++-native expat"
+SRCREV = "530a887913d3b0dd7091eabb8eef8e3c279e3bb8"
+
+PE = "1"
+PV = "0.5.0+gitr${SRCPV}"
+
+SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
+#           file://fix-linking.patch;patch=1"
+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.*"
+
diff --git a/recipes/dbus/dbus-c++_svn.bb b/recipes/dbus/dbus-c++_svn.bb
deleted file mode 100644
index 80e6f14e0a..0000000000
--- a/recipes/dbus/dbus-c++_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "C++ bindings for dbus"
-LICENSE = "LGPL"
-SECTION = "libs"
-DEPENDS = "dbus dbus-c++-native expat"
-SRCREV = "13131"
-
-SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http"
-#           file://fix-linking.patch;patch=1"
-S = "${WORKDIR}/dbus"
-
-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.*"
-
-- 
cgit v1.2.3