From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Date: Tue, 11 May 2010 20:24:32 +0000 (+0200)
Subject: matchbox-desktop 0.9.1: fix segfault at startup and convert to new staging
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6205a271b411d75bbb386b24ce18d0f72839d955;p=openembedded.git

matchbox-desktop 0.9.1: fix segfault at startup and convert to new staging

If matchbox-common is not present,matchbox-desktop segfault
  (the debugging was done with strace)
Also convert to new staging:
  I had packaged staging,removed the custom do_stage and got:
    staging/armv6-angstrom-linux-gnueabi/usr/include/matchbox-desktop $ ls
    mbdesktop.h  mbdesktop_item.h  mbdesktop_module.h  mbdesktop_view.h
  Thanks Tartarus for confirming me what to do in case of custom do_stage
---

diff --git a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 21e6dd9a60..6bd20833a5 100644
--- a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -2,12 +2,14 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch;patch=1 \
            file://mb-desktop-multi-category-matching.patch;patch=1"
 
+RDEPENDS += "matchbox-common"
+
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
 inherit autotools pkgconfig
@@ -26,12 +28,5 @@ FILES_${PN}-dev += "${libdir}/matchbox-desktop \
 
 FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
 
-
-do_stage() {
-		install -d ${STAGING_INCDIR}/matchbox-desktop/
-		install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/
-
-}
-
 SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
 SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"