mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

puzzles: switch svn for git, as upstream has done the same

Browse Source 
Also, drop puzzles_x32_abi_time.patch as it has been merged upstream

(From OE-Core rev: e95e6b0bdfe1bc9b71af82e3be260300232bb77e)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2015-07-08 17:30:52 +03:00
committed by Richard Purdie
parent 6e1f77c3fe
commit 918379aecf
2 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
View File

@@ -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 <anibal.limon@linux.intel.com>
--- 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) {

9
meta/recipes-sato/puzzles/puzzles_r10286.bb → meta/recipes-sato/puzzles/puzzles_git.bb
View File

@@ -2,7 +2,6 @@ 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"
@@ -10,12 +9,14 @@ 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} \
SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://fix-compiling-failure-with-option-g-O.patch \
file://puzzles_x32_abi_time.patch \
"
SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a"
PE = "1"
PV = "0.0+git${SRCPV}"
S = "${WORKDIR}/${BPN}"
S = "${WORKDIR}/git"
inherit autotools-brokensep distro_features_check