summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-07-08 17:30:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 22:40:56 +0100
commit918379aecf798c7e5319dc5daf24142c27b2db6c (patch)
tree3a6157dec836409b76fac06c8fe4dc00a3e4ddf5 /meta
parent6e1f77c3fe67a6a67d726eea1458be38e5dc5a2a (diff)
downloadpoky-918379aecf798c7e5319dc5daf24142c27b2db6c.tar.gz
puzzles: switch svn for git, as upstream has done the same
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch30
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb (renamed from meta/recipes-sato/puzzles/puzzles_r10286.bb)9
2 files changed, 5 insertions, 34 deletions
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 @@
1Fix printf's for time_t value add castings because ISOC90
2don't support long long int that is used in x32 ABI for
3time_t.
4
5Upstream-Status: Backport
6
7Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
8
9--- a/magnets.c 2015-03-15 11:57:39.106674811 +0000
10+++ b/magnets.c 2015-03-15 11:57:58.638674795 +0000
11@@ -2562,7 +2562,7 @@
12 goto done;
13 }
14 s = new_game(NULL, p, desc);
15- printf("%s:%s (seed %ld)\n", id, desc, seed);
16+ printf("%s:%s (seed %ld)\n", id, desc, (long) seed);
17 if (aux) {
18 /* We just generated this ourself. */
19 if (verbose || print) {
20--- a/signpost.c 2015-03-15 11:58:52.866674751 +0000
21+++ b/signpost.c 2015-03-15 11:59:08.190674738 +0000
22@@ -2393,7 +2393,7 @@
23 }
24 }
25
26- sprintf(newseed, "%lu", time(NULL));
27+ sprintf(newseed, "%lu", (unsigned long) time(NULL));
28 seedstr = dupstr(newseed);
29
30 if (id || !stdin_desc) {
diff --git a/meta/recipes-sato/puzzles/puzzles_r10286.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 1ad8d1bf14..11e922511c 100644
--- a/meta/recipes-sato/puzzles/puzzles_r10286.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -2,7 +2,6 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection"
2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" 2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
3 3
4DEPENDS = "gtk+ libxt" 4DEPENDS = "gtk+ libxt"
5MOD_PV = "${@d.getVar('PV',1)[1:]}"
6 5
7# The libxt requires x11 in DISTRO_FEATURES 6# The libxt requires x11 in DISTRO_FEATURES
8REQUIRED_DISTRO_FEATURES = "x11" 7REQUIRED_DISTRO_FEATURES = "x11"
@@ -10,12 +9,14 @@ REQUIRED_DISTRO_FEATURES = "x11"
10LICENSE = "MIT" 9LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" 10LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
12 11
13SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ 12SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
14 file://fix-compiling-failure-with-option-g-O.patch \ 13 file://fix-compiling-failure-with-option-g-O.patch \
15 file://puzzles_x32_abi_time.patch \
16" 14"
15SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a"
16PE = "1"
17PV = "0.0+git${SRCPV}"
17 18
18S = "${WORKDIR}/${BPN}" 19S = "${WORKDIR}/git"
19 20
20inherit autotools-brokensep distro_features_check 21inherit autotools-brokensep distro_features_check
21 22