aboutsummaryrefslogtreecommitdiffstats
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 17:28:12 +0100
commite95e6b0bdfe1bc9b71af82e3be260300232bb77e (patch)
tree0a60a8f4aa7c47c7aa024e62a101bf45f4f453db
parentda42bb17aff90f5c6da04b34225aab4d76ab8654 (diff)
downloadopenembedded-core-contrib-e95e6b0bdfe1bc9b71af82e3be260300232bb77e.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 Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
-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) {
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"
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