merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'

     and '94fb88049d8aea8313c398d3df50af2d4646f619'

8 files changed, 53 insertions, 8 deletions

diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 3fb2d04a81..bc72ea5b3b 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -21,7 +21,7 @@
 
 # We play a special package function
 inherit package
-PACKAGE_DEPENDS += "pax-utils-native"
+PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native"
 #PACKAGE_DEPENDS += chrpath-native"
 PACKAGEFUNCS += " do_package_qa "
 
@@ -308,8 +308,22 @@ def package_qa_check_pcla(path,name,d):
     .pc and .la files should not point to the WORKDIR
     """
     sane = True
+    # TODO
     return sane
 
+def package_qa_check_desktop(path, name, d):
+    """
+    Run all desktop files through desktop-file-validate.
+    """
+    import bb, os
+    if path.endswith(".desktop"):
+        validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate')
+        output = os.popen("%s %s" % (validate, path))
+        # This only produces output on errors
+        for l in output:
+            bb.error(l.strip())
+    return True
+
 def package_qa_check_staged(path,d):
     """
     Check staged la and pc files for sanity
@@ -416,9 +430,13 @@ python do_package_qa () {
     walk_sane = True
     rdepends_sane = True
     for package in packages.split():
+        if bb.data.getVar('INSANE_SKIP_' + package, d, True):
+            bb.note("Package: %s (skipped)" % package)
+            continue
+
         bb.note("Checking Package: %s" % package)
         path = "%s/install/%s" % (workdir, package)
-        if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d):
+        if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d):
             walk_sane  = False
         if not package_qa_check_rdepends(package, workdir, d):
             rdepends_sane = False
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index e5db7a9ceb..ccd458da89 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}"
 SRCDATE_python-evas ?= "${EFL_SRCDATE}"
 SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
 SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
 SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
 SRCDATE_python-etk ?= "${EFL_SRCDATE}"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 864f6fe178..b5682eb3e9 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -48,9 +48,9 @@ SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3207"
+SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "3358"
+SRCREV_pn-neod ?= "3421"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
@@ -81,6 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
 SRCREV_pn-openmoko-messages ?= "2276"
+SRCREV_pn-openmoko-messages2 ?= "3424"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "3289"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3342"
-SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openmoko-today2-folders ?= "3414"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 758f6c612f..f2007c231f 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -24,10 +24,12 @@ PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
   snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
+  snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \
   snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \
   \
   updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
   updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
+  updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \
   updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 "
 
 # 2.18 seems to break badly on 64-bit systems
diff --git a/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb
new file mode 100644
index 0000000000..9603982ea6
--- /dev/null
+++ b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb
@@ -0,0 +1,12 @@
+SECTION = "console/utils"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+DESCRIPTION = "command line utilities to work with *.desktop files"
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
+
+inherit autotools native
+
+S = "${WORKDIR}/desktop-file-utils-${PV}"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
new file mode 100644
index 0000000000..bc1bcaff5e
--- /dev/null
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "The OpenMoko Message application"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb
index 59d24b9d74..57eb9e33fb 100644
--- a/packages/wifi-radar/wifi-radar_1.9.6.bb
+++ b/packages/wifi-radar/wifi-radar_1.9.6.bb
@@ -3,11 +3,11 @@ DESCRIPTION="WiFi Radar is a Python/PyGTK2  utility for managing WiFi profiles."
 HOMEPAGE="http://www.bitbuilder.com/wifi_radar/"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
-RDEPENDS = "python-core python-pygtk2 python-re python-io python-pygobject python-pycairo"
+RDEPENDS = "python-core python-pygtk python-re python-io python-pygobject python-pycairo"
 
 SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \
         file://wifi-radar.patch;patch=1 \
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb
index 7d9dc18c84..6e5d7fe5ba 100644
--- a/packages/xorg-data/xbitmaps_1.0.1.bb
+++ b/packages/xorg-data/xbitmaps_1.0.1.bb
@@ -2,5 +2,5 @@ require xorg-data-common.inc
 
 DESCRIPTION = "Common X11 Bitmaps"
 LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
+DEPENDS += "libxmu"