summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openembedded/packages/meta/meta-oh.bb3
-rw-r--r--openembedded/packages/meta/oh-image.bb2
-rw-r--r--openembedded/packages/puzzles/puzzles_r6358.bb33
3 files changed, 32 insertions, 6 deletions
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index fbde8db5a0..470f78b3dc 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
# oh-task-base
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r8"
+PR = "r9"
ALLOW_EMPTY = "1"
@@ -32,6 +32,7 @@ oh-task-base = "\
gtk-clearlooks-engine \
eds \
puzzles \
+ puzzles-dekstop \
kf \
rxvt-unicode \
xhost \
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 60060b90fd..bdfff22af1 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
export IMAGE_BASENAME = "oh-image"
diff --git a/openembedded/packages/puzzles/puzzles_r6358.bb b/openembedded/packages/puzzles/puzzles_r6358.bb
index 32bd695534..4a39dbff14 100644
--- a/openembedded/packages/puzzles/puzzles_r6358.bb
+++ b/openembedded/packages/puzzles/puzzles_r6358.bb
@@ -1,17 +1,42 @@
DEPENDS = "gtk+"
+PR = "r1"
SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
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`'; "
-FILES_${PN} = "usr/games/*"
+PACKAGES = "${PN} ${PN}-desktop"
+
+FILES_${PN} = "${prefix}/games/*"
+FILES_${PN}-desktop = "${datadir}/applications/*"
do_install () {
export prefix=${D}
export DESTDIR=${D}
- install -d ${D}/usr
- install -d ${D}/usr/games
- oe_runmake install
+ install -d ${D}/${prefix}
+ install -d ${D}/${prefix}/games
+ oe_runmake install
+
+ install -d ${D}/${datadir}
+ install -d ${D}/${datadir}/applications
+ cd ${D}/${prefix}/games
+
+ for prog in *; do
+ if [ -x $prog ]; then
+ echo "making ${D}/${datadir}/applications/$prog.desktop"
+ cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$prog
+Exec=${prefix}/games/$prog
+Icon=game.png
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+STOP
+ fi
+ done
}