From 8667ea0d2d593b2118fafc217ade1875e422a41b Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 14 Apr 2011 15:41:30 +0800 Subject: puzzles: Upgrade to svn r9151 (from r9084) (From OE-Core rev: 10dc656eb1ef3e0d36424c440e6ec42cccb08a47) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- .../puzzles/files/oh-puzzles-owl-menu.patch | 5 ++ meta/recipes-sato/puzzles/puzzles_r9084.bb | 61 ---------------------- meta/recipes-sato/puzzles/puzzles_r9151.bb | 61 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-sato/puzzles/puzzles_r9084.bb create mode 100644 meta/recipes-sato/puzzles/puzzles_r9151.bb (limited to 'meta/recipes-sato/puzzles') diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch index 61da9191a8..7e2c3ab75d 100644 --- a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch +++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch @@ -1,3 +1,8 @@ +This patch enable owl menu, which is hidden in the title bar to save space on +small screen. It has not been used for a long time, rebase needed. + +Upstream-Status: Inappropriate [enable feature] + Index: src/gtk.c =================================================================== --- src/gtk.c (revision 22) diff --git a/meta/recipes-sato/puzzles/puzzles_r9084.bb b/meta/recipes-sato/puzzles/puzzles_r9084.bb deleted file mode 100644 index fbd0e37d55..0000000000 --- a/meta/recipes-sato/puzzles/puzzles_r9084.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION="Simon Tatham's Portable Puzzle Collection" -HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" - -DEPENDS = "gtk+ libxt" -PR = "r0" -MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5" - -SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz" - -# Checksums seem to be changing regularly right now, need to verify with upstream -#SRC_URI[md5sum] = "e8b4c7e2341264789f3cd6733857bf1c" -#SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2" -#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}" - -S = "${WORKDIR}/${PN}-${PV}" - -do_configure () { - ./mkfiles.pl -} - -do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " - -FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*" -FILES_${PN}-dbg += "${prefix}/games/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - 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 - # Convert prog to Title Case - title=$(echo $prog | sed 's/\(^\| \)./\U&/g') - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat < ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Name=$title -Exec=${prefix}/games/$prog -Icon=applications-games -Terminal=false -Type=Application -Categories=Game; -StartupNotify=true -X-MB-SingleInstance=true -STOP - fi - done -} diff --git a/meta/recipes-sato/puzzles/puzzles_r9151.bb b/meta/recipes-sato/puzzles/puzzles_r9151.bb new file mode 100644 index 0000000000..5cd8bb912a --- /dev/null +++ b/meta/recipes-sato/puzzles/puzzles_r9151.bb @@ -0,0 +1,61 @@ +DESCRIPTION="Simon Tatham's Portable Puzzle Collection" +HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" + +DEPENDS = "gtk+ libxt" +PR = "r0" +MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5" + +SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz" + +# Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now +#SRC_URI[md5sum] = "e8b4c7e2341264789f3cd6733857bf1c" +#SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2" +#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}" + +S = "${WORKDIR}/${PN}-${PV}" + +do_configure () { + ./mkfiles.pl +} + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + 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 + # Convert prog to Title Case + title=$(echo $prog | sed 's/\(^\| \)./\U&/g') + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Name=$title +Exec=${prefix}/games/$prog +Icon=applications-games +Terminal=false +Type=Application +Categories=Game; +StartupNotify=true +X-MB-SingleInstance=true +STOP + fi + done +} -- cgit v1.2.3-54-g00ecf