Add minimo (+ deps: zip, libxi). Update puzzzles to include icon. Update meta packages with new programs.

git-svn-id: https://svn.o-hand.com/repos/poky@86 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 11 insertions, 13 deletions

diff --git a/openembedded/packages/puzzles/puzzles_r6358.bb b/openembedded/packages/puzzles/puzzles_r6358.bb
index 4b4e212014..06d243380a 100644
--- a/openembedded/packages/puzzles/puzzles_r6358.bb
+++ b/openembedded/packages/puzzles/puzzles_r6358.bb
@@ -1,20 +1,15 @@
 
 DEPENDS = "gtk+"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
+SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \
+           file://game.png"
 
-CFLAGS_prepend = " -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` "
-do_compile_prepend = " export 'XLDFLAGS=${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; "
+do_compile_prepend = " \
+        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
+        export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
 
-PACKAGES = "${PN} ${PN}-desktop"
-
-FILES_${PN} = "${prefix}/games/*"
-FILES_${PN}-desktop = "${datadir}/applications/*"
-
-do_compile () {
-        CFLAGS=" -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` " oe_runmake
-}
+FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
 
 do_install () {
     export prefix=${D}
@@ -25,8 +20,11 @@ do_install () {
     
     install -d ${D}/${datadir}
     install -d ${D}/${datadir}/applications
-    cd ${D}/${prefix}/games 
+    install -d ${D}/${datadir}/pixmaps
+
+    install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps
 
+    cd ${D}/${prefix}/games 
     for prog in *; do
         if [ -x $prog ]; then
             echo "making ${D}/${datadir}/applications/$prog.desktop"