summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-02-27 15:16:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:13:55 +0000
commitd5182b3529bbcdaf98efd0f52cbbdd78f1313304 (patch)
treee0b7b7a8cca480d541e1288984698c32084d9625
parenteac885c618fee967c2491d220ce3ea335533e2c2 (diff)
downloadpoky-d5182b3529bbcdaf98efd0f52cbbdd78f1313304.tar.gz
puzzles: upgrade to latest revision
License-Update: checksum change is due to standardization of character encoding of source tree on UTF-8 1. Remove upstreamed patch: 0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch 2. Bump PE to prevent version going backwards (From OE-Core rev: 5e39466587e5e3546b44dca1e3216097713c285e) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch47
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb7
2 files changed, 3 insertions, 51 deletions
diff --git a/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch b/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
deleted file mode 100644
index 19abdd5f35..0000000000
--- a/meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 7b2949c48a178861f6568a18c8f45e841e36f89e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 7 Feb 2018 23:57:12 -0800
4Subject: [PATCH] signpost: Add paranthesis to remove doubt about precendence
5
6Clang complains e.g.
7
8error: logical not is only applied to the left hand side of
9 this bitwise operator [-Werror,-Wlogical-not-parentheses]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 signpost.c | 2 +-
16 tracks.c | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/signpost.c b/signpost.c
20index aa2e13a..2e2dff2 100644
21--- a/signpost.c
22+++ b/signpost.c
23@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable)
24 int i, ret = 1;
25 assert(copy->n == orig->n);
26 for (i = 0; i < copy->n; i++) {
27- if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
28+ if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue;
29 assert(copy->nums[i] >= 0);
30 assert(copy->nums[i] <= copy->n);
31 if (copy->nums[i] != orig->nums[i]) {
32diff --git a/tracks.c b/tracks.c
33index 5b27350..ca44ce1 100644
34--- a/tracks.c
35+++ b/tracks.c
36@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n,
37 x = i%w;
38 y = i/w;
39 if (abs(ox-x) > 1 || abs(oy-y) > 1) {
40- if (!state->sflags[i] & S_TRACK)
41+ if (!(state->sflags[i] & S_TRACK))
42 did += solve_set_sflag(state, x, y, S_NOTRACK, what);
43 }
44 }
45--
462.16.1
47
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 4fe6298cba..bfd817719f 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -7,18 +7,17 @@ DEPENDS = "libxt"
7REQUIRED_DISTRO_FEATURES = "x11" 7REQUIRED_DISTRO_FEATURES = "x11"
8 8
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" 10LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
11 11
12SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ 12SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
13 file://fix-compiling-failure-with-option-g-O.patch \ 13 file://fix-compiling-failure-with-option-g-O.patch \
14 file://0001-Use-labs-instead-of-abs.patch \ 14 file://0001-Use-labs-instead-of-abs.patch \
15 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ 15 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
16 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ 16 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
17 file://0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch \
18 " 17 "
19UPSTREAM_CHECK_COMMITS = "1" 18UPSTREAM_CHECK_COMMITS = "1"
20SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3" 19SRCREV = "2adf0052d66eae88c7a5e55e67fe16e13f7018b5"
21PE = "1" 20PE = "2"
22PV = "0.0+git${SRCPV}" 21PV = "0.0+git${SRCPV}"
23 22
24S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"