From e95e6b0bdfe1bc9b71af82e3be260300232bb77e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jul 2015 17:30:52 +0300 Subject: puzzles: switch svn for git, as upstream has done the same Also, drop puzzles_x32_abi_time.patch as it has been merged upstream Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../puzzles/files/puzzles_x32_abi_time.patch | 30 ----------- meta/recipes-sato/puzzles/puzzles_git.bb | 60 ++++++++++++++++++++++ meta/recipes-sato/puzzles/puzzles_r10286.bb | 59 --------------------- 3 files changed, 60 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch create mode 100644 meta/recipes-sato/puzzles/puzzles_git.bb delete mode 100644 meta/recipes-sato/puzzles/puzzles_r10286.bb diff --git a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch deleted file mode 100644 index 63ab0b888d..0000000000 --- a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix printf's for time_t value add castings because ISOC90 -don't support long long int that is used in x32 ABI for -time_t. - -Upstream-Status: Backport - -Signed-off-by: Aníbal Limón - ---- a/magnets.c 2015-03-15 11:57:39.106674811 +0000 -+++ b/magnets.c 2015-03-15 11:57:58.638674795 +0000 -@@ -2562,7 +2562,7 @@ - goto done; - } - s = new_game(NULL, p, desc); -- printf("%s:%s (seed %ld)\n", id, desc, seed); -+ printf("%s:%s (seed %ld)\n", id, desc, (long) seed); - if (aux) { - /* We just generated this ourself. */ - if (verbose || print) { ---- a/signpost.c 2015-03-15 11:58:52.866674751 +0000 -+++ b/signpost.c 2015-03-15 11:59:08.190674738 +0000 -@@ -2393,7 +2393,7 @@ - } - } - -- sprintf(newseed, "%lu", time(NULL)); -+ sprintf(newseed, "%lu", (unsigned long) time(NULL)); - seedstr = dupstr(newseed); - - if (id || !stdin_desc) { diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb new file mode 100644 index 0000000000..11e922511c --- /dev/null +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -0,0 +1,60 @@ +SUMMARY = "Simon Tatham's Portable Puzzle Collection" +HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" + +DEPENDS = "gtk+ libxt" + +# The libxt requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" + +SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ + file://fix-compiling-failure-with-option-g-O.patch \ +" +SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a" +PE = "1" +PV = "0.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep distro_features_check + +do_configure_prepend () { + ./mkfiles.pl +} + +FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" +FILES_${PN}-dbg += "${prefix}/bin/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/bin/ + oe_runmake install + + + install -d ${D}/${datadir}/applications/ + + # Create desktop shortcuts + cd ${D}/${prefix}/bin + 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}/bin/$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_r10286.bb b/meta/recipes-sato/puzzles/puzzles_r10286.bb deleted file mode 100644 index 1ad8d1bf14..0000000000 --- a/meta/recipes-sato/puzzles/puzzles_r10286.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Simon Tatham's Portable Puzzle Collection" -HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" - -DEPENDS = "gtk+ libxt" -MOD_PV = "${@d.getVar('PV',1)[1:]}" - -# The libxt requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" - -SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ - file://fix-compiling-failure-with-option-g-O.patch \ - file://puzzles_x32_abi_time.patch \ -" - -S = "${WORKDIR}/${BPN}" - -inherit autotools-brokensep distro_features_check - -do_configure_prepend () { - ./mkfiles.pl -} - -FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" -FILES_${PN}-dbg += "${prefix}/bin/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/bin/ - oe_runmake install - - - install -d ${D}/${datadir}/applications/ - - # Create desktop shortcuts - cd ${D}/${prefix}/bin - 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}/bin/$prog -Icon=applications-games -Terminal=false -Type=Application -Categories=Game; -StartupNotify=true -X-MB-SingleInstance=true -STOP - fi - done -} -- cgit 1.2.3-korg