4 files changed, 49 insertions, 32 deletions
diff --git a/recipes/openmoko-3rdparty/mokosuite2_git.bb b/recipes/openmoko-3rdparty/mokosuite2_git.bb
new file mode 100644
index 0000000000..e01cfb4110
--- /dev/null
+++ b/recipes/openmoko-3rdparty/mokosuite2_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Desktop environment and phone stack GUI for SHR"
+HOMEPAGE = "http://gitorious.org/mokosuite2"
+AUTHOR = "Daniele Ricci"
+LICENSE = "GPLv3"
+DEPENDS = "mokowm elementary libfreesmartphone-glib libphone-utils eggdbus glib-2.0 dbus-glib alsa-lib db sqlite3"
+SECTION = "misc/utils"
+
+PV = "1.0.99+gitr${SRCPV}"
+SRCREV = "b06f0d5ee9a8b3aef1be9c084975a8a08a3b3213"
+
+SRC_URI = "git://gitorious.org/mokosuite2/appbunch.git;protocol=git"
+S = "${WORKDIR}/git"
+
+PARALLEL_MAKE = ""
+
+CFLAGS += "-DOPENMOKO"
+EXTRA_OECONF = " --enable-contactsdb-sqlite --enable-settings-config --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+FILES_${PN} += "${datadir}/mokosuite ${sysconfdir}/dbus-1 ${sysconfdir}/X11 ${sysconfdir}/mokosuite.conf {$datadir}/applications"
+CONFFILES_${PN} = "${sysconfdir}/mokosuite.conf"
+
+inherit pkgconfig autotools
diff --git a/recipes/openmoko-3rdparty/mokosuite2_svn.bb b/recipes/openmoko-3rdparty/mokosuite2_svn.bb
deleted file mode 100644
index ea00b31a19..0000000000
--- a/recipes/openmoko-3rdparty/mokosuite2_svn.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Desktop environment and phone stack GUI for SHR"
-HOMEPAGE = "http://wiki.openmoko.org/"
-AUTHOR = "Daniele Ricci"
-LICENSE = "GPLv3"
-DEPENDS = "elementary libframeworkd-glib libphone-utils eggdbus glib-2.0 dbus-glib alsa-lib db sqlite3"
-SECTION = "misc/utils"
-
-PV = "1.0+svnr${SRCPV}"
-PR = "r1"
-SRCREV = "454"
-
-SRC_URI = "svn://svn.casaricci.it/openmoko/trunk;module=mokosuite;proto=svn"
-S = "${WORKDIR}/mokosuite"
-
-PARALLEL_MAKE = ""
-
-CFLAGS += "-DOPENMOKO"
-EXTRA_OECONF = " --enable-callsdb-sqlite --enable-contactsdb-sqlite --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-FILES_${PN} += "${datadir}/mokosuite ${sysconfdir}/dbus-1 ${sysconfdir}/X11 ${sysconfdir}/mokosuite.conf {$datadir}/applications"
-CONFFILES_${PN} = "${sysconfdir}/mokosuite.conf"
-
-inherit pkgconfig autotools update-alternatives
-
-ALTERNATIVE_PATH = "${bindir}/mokosession"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "20"
diff --git a/recipes/openmoko-3rdparty/mokowm-imf-ecore_svn.bb b/recipes/openmoko-3rdparty/mokowm-imf-ecore_git.bb
index 023757dc2a..1cd5fd1c6b 100644
--- a/recipes/openmoko-3rdparty/mokowm-imf-ecore_svn.bb
+++ b/recipes/openmoko-3rdparty/mokowm-imf-ecore_git.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "Ecore input method for the Mokosuite window manager"
-HOMEPAGE = "http://wiki.openmoko.org/"
+HOMEPAGE = "http://gitorious.org/mokosuite2"
 AUTHOR = "Daniele Ricci"
 LICENSE = "GPLv3"
 DEPENDS = "ecore eina"
 SECTION = "misc/utils"
 
-PV = "1.0+svnr${SRCPV}"
-SRCREV = "457"
+PV = "1.0.99+gitr${SRCPV}"
+SRCREV = "59c1afe3c347a4da38fa7a5f4f7dd080a65d0858"
 
-SRC_URI = "svn://svn.casaricci.it/openmoko/trunk;module=mokowm-imf-ecore;proto=svn"
-S = "${WORKDIR}/mokowm-imf-ecore"
+SRC_URI = "git://gitorious.org/mokosuite2/mokowm-imf-ecore.git;protocol=git"
+S = "${WORKDIR}/git"
 
 FILES_${PN}-dbg += "${libdir}/ecore/immodules/.debug"
 FILES_${PN} += "${libdir}/ecore/immodules"
diff --git a/recipes/openmoko-3rdparty/mokowm_git.bb b/recipes/openmoko-3rdparty/mokowm_git.bb
new file mode 100644
index 0000000000..625e366e05
--- /dev/null
+++ b/recipes/openmoko-3rdparty/mokowm_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A minimal X11 window manager for the Mokosuite"
+HOMEPAGE = "http://gitorious.org/mokosuite2"
+AUTHOR = "Daniele Ricci"
+LICENSE = "GPLv3"
+DEPENDS = "glib-2.0 ecore evas edje"
+SECTION = "x11/clients"
+
+PV = "1.0.99+gitr${SRCPV}"
+SRCREV = "fc51f730414aa9efd716849ac64ce582e53cfaf1"
+
+SRC_URI = "git://gitorious.org/mokosuite2/mokowm.git;protocol=git"
+S = "${WORKDIR}/git"
+
+CFLAGS += "-DOPENMOKO"
+EXTRA_OECONF = " --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+FILES_${PN} += "${datadir}/mokosuite ${sysconfdir}/X11"
+
+inherit autotools update-alternatives
+
+ALTERNATIVE_PATH = "${bindir}/mokosession"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "20"