Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

26 files changed, 294 insertions, 11 deletions

diff --git a/recipes/libetpan/files/libetpan-ldflags.patch b/recipes/libetpan/files/libetpan-ldflags.patch
new file mode 100644
index 0000000000..438f44f15a
--- /dev/null
+++ b/recipes/libetpan/files/libetpan-ldflags.patch
@@ -0,0 +1,11 @@
+--- libetpan-0.57/configure.ac~	2009-09-21 23:31:42.000000000 +0200
++++ libetpan-0.57/configure.ac	2009-09-21 23:31:42.000000000 +0200
+@@ -457,7 +457,7 @@
+       LDFLAGS="-$flag $LDFLAGS"
+       AC_TRY_LINK([], [pthread_create();], 
+                       [pthflag=yes; checkpthread=no], 
+-                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
++                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
+       AC_MSG_RESULT($pthflag)
+     fi
+   done
diff --git a/recipes/libetpan/libetpan_0.57.bb b/recipes/libetpan/libetpan_0.57.bb
index e0108f9fbd..841ddfbc77 100644
--- a/recipes/libetpan/libetpan_0.57.bb
+++ b/recipes/libetpan/libetpan_0.57.bb
@@ -4,10 +4,11 @@ HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
 DEPENDS = "gnutls"
 LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-	   file://libetpan-autoreconf.patch;patch=1"
+	   file://libetpan-autoreconf.patch;patch=1 \
+           file://libetpan-ldflags.patch;patch=1"
 
 inherit autotools pkgconfig gettext binconfig
 
@@ -21,3 +22,4 @@ do_stage() {
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
+
diff --git a/recipes/powervr-drivers/libgles-omap3/cputype b/recipes/powervr-drivers/libgles-omap3/cputype
index 31fc89b8e1..9dc2b49fa2 100755
--- a/recipes/powervr-drivers/libgles-omap3/cputype
+++ b/recipes/powervr-drivers/libgles-omap3/cputype
@@ -2,4 +2,4 @@
 devmem2 0x4800244c | \
 grep 'Value at address' | \
 sed -e 's/.*): //' | \
-sed -e 's/0x5C00/OMAP3503/' -e 's/0x1C00/OMAP3515/' -e 's/0x4C00/OMAP3525/' -e 's/0x0C00/OMAP3530/'
+sed -e 's/0x5C00/OMAP3503/' -e 's/0x1C00/OMAP3515/' -e 's/0x4C00/OMAP3525/' -e 's/0xC00/OMAP3530/'
diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr
index 20b5167b4c..4a698da60d 100755
--- a/recipes/powervr-drivers/libgles-omap3/rc.pvr
+++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr
@@ -2,7 +2,7 @@
 
 CPUTYPE="$(cputype)"
 
-if ( $CPUTYPE == "OMAP3530"); then
+if [ $CPUTYPE = "OMAP3530" ]; then
 
 	rmmod omaplfb
 	rmmod pvrsrvkm
diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb
new file mode 100644
index 0000000000..64bd23fe90
--- /dev/null
+++ b/recipes/shr/e-wm-config-illume-shr_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "illume SHR config"
+SECTION = "e/utils"
+DEPENDS = "eet"
+LICENSE = "MIT BSD"
+PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r6"
+
+inherit e
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/e-wm/${PN}"
+
+EXTRA_OECONF = "\
+  --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+"
+
+FILES_${PN} = "${datadir}/enlightenment/data/config/illume-shr"
+
+RRECOMMENDS_${PN} = "e-wm-theme-illume-shr e-wm-sysactions-shr e-wm-menu-shr"
+
diff --git a/recipes/shr/ophonekitd_git.bb b/recipes/shr/ophonekitd_git.bb
new file mode 100644
index 0000000000..ed561c7c75
--- /dev/null
+++ b/recipes/shr/ophonekitd_git.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Ophonekitd daemon"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui sqlite3"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r18"
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+inherit autotools
+
+do_install_append() {
+        install -d ${D}${sysconfdir}/X11/Xsession.d/
+        install -d ${D}${sysconfdir}/dbus-1/system.d/
+        install -d ${D}${datadir}/ophonekitd/
+        install -d ${D}${localstatedir}/db
+        install -m 0755 ${S}/data/80ophonekitd ${D}${sysconfdir}/X11/Xsession.d/
+        install -m 0755 ${S}/data/ophonekitd.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
diff --git a/recipes/shr/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb
new file mode 100644
index 0000000000..1b9a383130
--- /dev/null
+++ b/recipes/shr/shr-contacts_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "The SHR Contacts application"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r6"
+
+inherit pkgconfig autotools
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
diff --git a/recipes/shr/shr-dialer_git.bb b/recipes/shr/shr-dialer_git.bb
new file mode 100644
index 0000000000..796b96592b
--- /dev/null
+++ b/recipes/shr/shr-dialer_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "The SHR Dialer"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r9"
+
+inherit pkgconfig autotools
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb
new file mode 100644
index 0000000000..1206d635d5
--- /dev/null
+++ b/recipes/shr/shr-installer_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "EFL frontend for packagekit"
+HOMEPAGE = "http://shr-project.org"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit"
+SECTION = "x11/application"
+
+PV = "0.0.1-gitr${SRCREV}"
+PR = "r0"
+
+inherit setuptools
+
+SRC_URI = "git://git.shr-project.org/repo/shr-installer.git;protocol=http"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
+
diff --git a/recipes/shr/shr-messages_git.bb b/recipes/shr/shr-messages_git.bb
new file mode 100644
index 0000000000..6fc0694c29
--- /dev/null
+++ b/recipes/shr/shr-messages_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "The SHR Messages"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r8"
+
+inherit pkgconfig autotools
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb
new file mode 100644
index 0000000000..4bf41fbd29
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "SHR splash screen - DON'T PANIC theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCREV}"
+PR = "r6"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+require shr-splash-theme.inc
diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb
new file mode 100644
index 0000000000..773d4f16db
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-handy_git.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "SHR splash screen - handy theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCREV}"
+PR = "r3"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+require shr-splash-theme.inc
diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb
new file mode 100644
index 0000000000..40a0973f2b
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-niebiee_git.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+require shr-splash-theme.inc
+
diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb
new file mode 100644
index 0000000000..865e18fce7
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-simple_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "SHR splash screen - simple SHR theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCREV}"
+PR = "r6"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+ALTERNATIVE_PRIORITY = 2
+
+require shr-splash-theme.inc
+
diff --git a/recipes/shr/shr-splash-theme.inc b/recipes/shr/shr-splash-theme.inc
new file mode 100644
index 0000000000..50e62bcb7e
--- /dev/null
+++ b/recipes/shr/shr-splash-theme.inc
@@ -0,0 +1,23 @@
+RPROVIDES_${PN} = "virtual/shr-splash-theme"
+RDEPENDS += "shr-splash"
+
+inherit update-alternatives
+
+FILES_${PN} = "${datadir}/shr-splash/themes/${PN}"
+
+ALTERNATIVE_NAME = "shr-splash-theme"
+ALTERNATIVE_LINK = "${datadir}/shr-splash/theme"
+ALTERNATIVE_PATH = "${datadir}/shr-splash/themes/${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+do_install() {
+    install -d ${D}${datadir}/shr-splash/themes/${PN}
+
+    install -m 0644 ${S}/xsplash-vga.ppm ${D}${datadir}/shr-splash/themes/${PN}/xsplash-vga.ppm
+    install -m 0644 ${S}/boot.fbz ${D}${datadir}/shr-splash/themes/${PN}/boot.fbz
+    install -m 0644 ${S}/shutdown.fbz ${D}${datadir}/shr-splash/themes/${PN}/shutdown.fbz
+    install -m 0644 ${S}/name ${D}${datadir}/shr-splash/themes/${PN}/name
+    install -m 0644 ${S}/author ${D}${datadir}/shr-splash/themes/${PN}/author
+    install -m 0644 ${S}/preview.png ${D}${datadir}/shr-splash/themes/${PN}/preview.png
+}
+
diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb
new file mode 100644
index 0000000000..1ce7373e82
--- /dev/null
+++ b/recipes/shr/shr-splash_git.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "SHR splash screen"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCREV}"
+PR = "r4"
+RRECOMMENDS_${PN} += "\
+	virtual/shr-splash-theme"
+
+inherit update-rc.d
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/${PN}"
+
+FILES_${PN} = "${datadir}/shr-splash \
+	       ${sysconfdir}/init.d/shr-splash.sh \
+"
+
+do_install() {
+    install -d ${D}${datadir}/shr-splash
+    install -d ${D}${datadir}/shr-splash/themes
+    install -d ${D}${sysconfdir}/init.d
+
+    install -m 0755 ${S}/shr-splash.sh        ${D}${sysconfdir}/init.d/shr-splash.sh
+
+}
+
+pkg_postinst() {
+    [ -e ${datadir}/pixmaps/xsplash-vga.ppm ] || ln -s ${datadir}/shr-splash/theme/xsplash-vga.ppm ${datadir}/pixmaps/xsplash-vga.ppm
+}
+
+
+INITSCRIPT_NAME = "shr-splash.sh"
+INITSCRIPT_PARAMS = "start 01 S . stop 21 0 1 6 ."
diff --git a/recipes/shr/shr-theme-niebiee.bb b/recipes/shr/shr-theme-niebiee.bb
new file mode 100644
index 0000000000..5e5a1399e6
--- /dev/null
+++ b/recipes/shr/shr-theme-niebiee.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Niebiee - extremely blue theme for SHR (metapackage)"
+SECTION = "x11/data"
+RDEPENDS += "e-wm-theme-illume-niebiee elementary-theme-niebiee shr-splash-theme-niebiee"
+PV = "0.1"
+PR = "r1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/shr/shr-theme_git.bb b/recipes/shr/shr-theme_git.bb
new file mode 100644
index 0000000000..54803107a4
--- /dev/null
+++ b/recipes/shr/shr-theme_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Standard icon theme for the SHR distribution"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/data"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r2"
+
+inherit autotools
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+pkg_postinst_shr-theme () {
+}
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += "${datadir}/icons"
diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb
new file mode 100644
index 0000000000..c6947cf3ca
--- /dev/null
+++ b/recipes/shr/shr-today_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "python-elementary and opimd based lock and today screen for the SHR distribution"
+HOMEPAGE = "http://wiki.github.com/slyon/today"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+RDEPENDS = "python-elementary python-dbus python-edbus python-ecore"
+SECTION = "x11/applications"
+
+PV = "0.0.1-gitr${SRCREV}"
+PR = "r0"
+
+inherit setuptools
+
+SRC_URI = "git://github.com/slyon/today.git;protocol=http"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "/etc/shr-today.conf"
+FILES_${PN} += "/usr/share/shr-today"
+FILES_${PN} += "/etc/X11/Xsession.d/89shr-today"
+CONFFILES_${PN} += "/etc/shr-today.conf"
+
diff --git a/recipes/sqlite/sqlite_2.8.17.bb b/recipes/sqlite/sqlite_2.8.17.bb
index 9f6ec7efe2..5c873d2814 100644
--- a/recipes/sqlite/sqlite_2.8.17.bb
+++ b/recipes/sqlite/sqlite_2.8.17.bb
@@ -4,12 +4,12 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses"
 LICENSE = "PD"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
        file://mainmk_build_dynamic.patch;patch=1 \
        file://mainmk_no_tcl.patch;patch=1 \
-	   file://sqlite.pc"
+       file://sqlite.pc"
 
 SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \
            expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \
@@ -20,6 +20,8 @@ inherit autotools pkgconfig
 
 do_configure() {
     echo "main.mk is patched, no need to configure"
+    # make pkgconfig.bbclass pick this up
+    mv ${WORKDIR}/sqlite.pc ${S}
 }
 
 do_compile() {
@@ -39,9 +41,6 @@ do_stage() {
         ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0
         ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0.8
         install -m 0644 sqlite.h ${STAGING_INCDIR}
-
-	# make pkgconfig.bbclass pick this up
-	mv ${WORKDIR}/sqlite.pc ${S}
 }
 
 do_install() {
@@ -53,9 +52,10 @@ do_install() {
         ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8
         install -d ${D}${includedir}
         install -m 0644 sqlite.h ${D}${includedir}/sqlite.h
+        install -d ${D}${libdir}/pkgconfig
+        install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc
 }
 
 PACKAGES += "${PN}-bin"
 FILES_${PN}-bin = "${bindir}/*"
 FILES_${PN} = "${libdir}/*.so.*"
-
diff --git a/recipes/sugar/python-xklavier_0.2.bb b/recipes/sugar/python-xklavier_0.2.bb
new file mode 100644
index 0000000000..76dd7e73cc
--- /dev/null
+++ b/recipes/sugar/python-xklavier_0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python libxklavier Bindings"
+HOMEPAGE = "http://lists.sugarlabs.org/archive/sugar-devel/2009-August/018480.html"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "libxklavier"
+PR = "r0"
+
+SRC_URI = "http://download.sugarlabs.org/sources/external/python-xklavier/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig distutils-base
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
diff --git a/recipes/sugar/sugar-artwork_0.84.1.bb b/recipes/sugar/sugar-artwork_0.84.1.bb
index c96cf7a38e..7d4f9f866e 100644
--- a/recipes/sugar/sugar-artwork_0.84.1.bb
+++ b/recipes/sugar/sugar-artwork_0.84.1.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 DEPENDS = "sugar icon-slicer-native"
+RDEPENDS = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
+            ttf-dejavu-serif ttf-dejavu-serif-condensed \
+            python-pycairo fontconfig freetype python-pygtk"
 
 SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/${PN}-${PV}.tar.bz2 "
 
diff --git a/recipes/sugar/sugar-base_0.84.1.bb b/recipes/sugar/sugar-base_0.84.1.bb
index c96cbf9470..090e92448f 100644
--- a/recipes/sugar/sugar-base_0.84.1.bb
+++ b/recipes/sugar/sugar-base_0.84.1.bb
@@ -3,6 +3,8 @@ LICENSE = "LGPLv2"
 
 DEPENDS = "python-pygtk sugar-toolkit"
 RDEPENDS = "librsvg-gtk \
+            gconf \
+            matchbox-wm \
             ohm-plugin-x11 ohm \
             hippo-canvas \
             python-datetime \
@@ -14,6 +16,8 @@ RDEPENDS = "librsvg-gtk \
             python-subprocess \
             telepathy-gabble telepathy-salut telepathy-python \
             sugar-presence-service \
+            python-pycairo \
+            python-pygobject \
             python-crypt \
             python-numpy \
             python-compression \
diff --git a/recipes/sugar/sugar-presence-service_0.84.0.bb b/recipes/sugar/sugar-presence-service_0.84.0.bb
index 78676d477a..56b7e45f23 100644
--- a/recipes/sugar/sugar-presence-service_0.84.0.bb
+++ b/recipes/sugar/sugar-presence-service_0.84.0.bb
@@ -4,6 +4,7 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 DEPENDS = "sugar-toolkit"
+RDEPEDS = "avahi networkmanager"
 
 SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/${PN}-${PV}.tar.bz2"
 
diff --git a/recipes/sugar/sugar-toolkit_0.84.4.bb b/recipes/sugar/sugar-toolkit_0.84.4.bb
index 864582d7e5..340e7dff2a 100644
--- a/recipes/sugar/sugar-toolkit_0.84.4.bb
+++ b/recipes/sugar/sugar-toolkit_0.84.4.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Sugar toolkit"
 LICENSE = "LGPLv2"
 DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+ alsa-lib"
+RDEPENDS = "python-pygtk"
 
 SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
 
diff --git a/recipes/xapian/xapian-bindings-python_1.0.14.bb b/recipes/xapian/xapian-bindings-python_1.0.14.bb
index 665cd58913..1180936f77 100644
--- a/recipes/xapian/xapian-bindings-python_1.0.14.bb
+++ b/recipes/xapian/xapian-bindings-python_1.0.14.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://xapian.org"
 SECTION = "devel/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "xapian-core"
+DEPENDS = "xapian-core xapian-core-native"
 PR = "r0"
 
 SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-bindings-${PV}.tar.gz"