diff options
-rw-r--r-- | meta/packages/puzzles/oh-puzzles_svn.bb | 8 | ||||
-rw-r--r-- | meta/packages/puzzles/puzzles_r6915.bb | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/packages/puzzles/oh-puzzles_svn.bb index ad978d38c0..f6599484e6 100644 --- a/meta/packages/puzzles/oh-puzzles_svn.bb +++ b/meta/packages/puzzles/oh-puzzles_svn.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" SECTION = "x11" DEPENDS = "gtk+ gconf intltool-native librsvg" PV = "0.1+svn${SRCDATE}" -PR = "r2" +PR = "r3" inherit autotools pkgconfig @@ -18,11 +18,15 @@ do_install_append () { cd ${D}/${prefix}/games for prog in *; do if [ -x $prog ]; then + # Convert prog to Title Case + firstchar=${prog:0:1} + title=`echo "$firstchar" | tr a-z A-Z` + title="$title${prog:1}" echo "making ${D}/${datadir}/applications/$prog.desktop" cat <<STOP > ${D}/${datadir}/applications/$prog.desktop [Desktop Entry] Encoding=UTF-8 -Name=$prog +Name=$title Exec=${prefix}/games/$prog Icon=applications-games Terminal=false diff --git a/meta/packages/puzzles/puzzles_r6915.bb b/meta/packages/puzzles/puzzles_r6915.bb index 3342b5d17c..bcb19bae2c 100644 --- a/meta/packages/puzzles/puzzles_r6915.bb +++ b/meta/packages/puzzles/puzzles_r6915.bb @@ -1,8 +1,17 @@ DEPENDS = "gtk+" PR = "r4" +MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}" -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" +SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV} \ + file://makedist_hack.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +do_configure () { + ./makedist.sh ${MOD_PV} +} do_compile_prepend = " \ export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ @@ -25,11 +34,15 @@ do_install () { cd ${D}/${prefix}/games for prog in *; do if [ -x $prog ]; then + # Convert prog to Title Case + firstchar=${prog:0:1} + title=`echo "$firstchar" | tr a-z A-Z` + title="$title${prog:1}" echo "making ${D}/${datadir}/applications/$prog.desktop" cat <<STOP > ${D}/${datadir}/applications/$prog.desktop [Desktop Entry] Encoding=UTF-8 -Name=$prog +Name=$title Exec=${prefix}/games/$prog Icon=applications-games Terminal=false |