Merge branch 'sugar' into org.openembedded.dev

9 files changed, 217 insertions, 1 deletions

diff --git a/recipes/images/sugar-image.bb b/recipes/images/sugar-image.bb
index 247927543b..e4513f6fe5 100644
--- a/recipes/images/sugar-image.bb
+++ b/recipes/images/sugar-image.bb
@@ -1,5 +1,6 @@
 XSERVER ?= "xserver-kdrive-fbdev"
 SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+ANGSTROM_EXTRA_INSTALL += ""
 
 export IMAGE_BASENAME = "sugar-image"
 
@@ -10,7 +11,7 @@ IMAGE_INSTALL = "\
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
-    sugar-sucrose \
+    task-sugar-sucrose \
     ${SPLASH} \
     ${ANGSTROM_EXTRA_INSTALL}"
 
diff --git a/recipes/sugar/etoys_4.0.2212.bb b/recipes/sugar/etoys_4.0.2212.bb
new file mode 100644
index 0000000000..b66dd22f9d
--- /dev/null
+++ b/recipes/sugar/etoys_4.0.2212.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Sugar etoys"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar"
+RDEPENDS = "sugar shared-mime-info"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-${PV}.tar.gz \
+           file://etoys.diff;patch=1"
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+PACKAGES_ARCH = "all"
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${datadir}/sugar/activities \
+                ${sysconfdir} "
+
diff --git a/recipes/sugar/sugar-artwork_0.84.1.bb b/recipes/sugar/sugar-artwork_0.84.1.bb
new file mode 100644
index 0000000000..c96cf7a38e
--- /dev/null
+++ b/recipes/sugar/sugar-artwork_0.84.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Sugar artwork"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar icon-slicer-native"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/${PN}-${PV}.tar.bz2 "
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/icons \
+                ${datadir}/themes \
+                ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.*/engines/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-base_0.84.1.bb b/recipes/sugar/sugar-base_0.84.1.bb
new file mode 100644
index 0000000000..e95a43e3a9
--- /dev/null
+++ b/recipes/sugar/sugar-base_0.84.1.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "LGPLv2"
+
+DEPENDS = "python-pygtk sugar-toolkit"
+RDEPENDS = "librsvg-gtk \
+            ohm-plugin-x11 ohm \
+            hippo-canvas \
+            python-datetime \
+            python-netclient \
+            python-pygtk \
+            sugar-toolkit \
+            python-logging \
+            python-dbus \
+            python-subprocess \
+            telepathy-gabble telepathy-salut telepathy-python \
+            sugar-presence-service \
+            python-crypt \
+            python-numpy \
+            python-compression \
+            python-gst \
+            python-simplejson \
+            python-misc \
+            python-xmlrpc \
+            python-compiler \
+            python-pydoc \
+            python-mmap \
+            python-doctest \
+            ssh-keygen"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/sugar/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-datastore_0.84.0.bb b/recipes/sugar/sugar-datastore_0.84.0.bb
new file mode 100644
index 0000000000..dde2748974
--- /dev/null
+++ b/recipes/sugar/sugar-datastore_0.84.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sugar datastore"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar-toolkit python-xappy "
+RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/${PN}-${PV}.tar.bz2"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
+FILES_${PN} += "${datadir}/dbus-1"
+
diff --git a/recipes/sugar/sugar-presence-service_0.84.0.bb b/recipes/sugar/sugar-presence-service_0.84.0.bb
new file mode 100644
index 0000000000..78676d477a
--- /dev/null
+++ b/recipes/sugar/sugar-presence-service_0.84.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Sugar presence service"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar-toolkit"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base mime
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime/packages \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} \
+                ${libdir}/python*/site-packages/"
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-toolkit_0.84.4.bb b/recipes/sugar/sugar-toolkit_0.84.4.bb
new file mode 100644
index 0000000000..864582d7e5
--- /dev/null
+++ b/recipes/sugar/sugar-toolkit_0.84.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Sugar toolkit"
+LICENSE = "LGPLv2"
+DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+ alsa-lib"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar_0.84.6.bb b/recipes/sugar/sugar_0.84.6.bb
new file mode 100644
index 0000000000..2ed38cde3d
--- /dev/null
+++ b/recipes/sugar/sugar_0.84.6.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar-toolkit libxml2 gtk+"
+RDEPENDS = "sugar-toolkit sugar-base sugar-datastore sugar-artwork gnome-python gnome-python-desktop python-cjson python-pygtksourceview"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base mime
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime/packages \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} "
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/tasks/task-sugar-sucrose.bb b/recipes/tasks/task-sugar-sucrose.bb
new file mode 100644
index 0000000000..d4812d9295
--- /dev/null
+++ b/recipes/tasks/task-sugar-sucrose.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Task for complete sugar environment with core activities"
+
+PR = "r0"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+        sugar \
+#        sugar-fructose \
+"