summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-01-23 16:05:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-26 13:09:10 +0000
commit3a3d1964a3ad5d41f79ea7afd8202674d5b4a26c (patch)
treeeeb645be1bab8eb12adcfefa60005f7d514ba552
parent7d3b1408d9ba556fccb5158562496143d5af4a3d (diff)
downloadpoky-3a3d1964a3ad5d41f79ea7afd8202674d5b4a26c.tar.gz
puzzles: upgrade to latest commit
Remove upstreamed patch: 0001-Clarify-conditions-to-avoid-compiler-errors.patch (From OE-Core rev: f93e26f0686c2096eb0ad782509ac5257f76ebe9) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch48
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb1
2 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch b/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch
deleted file mode 100644
index 89aa1587c1..0000000000
--- a/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 72f2e9043ef509992dfa61791638db87bf0ae37b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 6 Dec 2016 01:20:00 +0000
4Subject: [PATCH] Clarify conditions to avoid compiler errors
5
6Fix errors pointed out by clang
7
8error: logical not is only applied to the left hand side of this bitwise operator [-Werror,-Wlogical-not-parentheses]
9| if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
10| ^
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Submitted
15
16 signpost.c | 2 +-
17 tracks.c | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/signpost.c b/signpost.c
21index aa2e13a..2e2dff2 100644
22--- a/signpost.c
23+++ b/signpost.c
24@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable)
25 int i, ret = 1;
26 assert(copy->n == orig->n);
27 for (i = 0; i < copy->n; i++) {
28- if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
29+ if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue;
30 assert(copy->nums[i] >= 0);
31 assert(copy->nums[i] <= copy->n);
32 if (copy->nums[i] != orig->nums[i]) {
33diff --git a/tracks.c b/tracks.c
34index 5b27350..ca44ce1 100644
35--- a/tracks.c
36+++ b/tracks.c
37@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n,
38 x = i%w;
39 y = i/w;
40 if (abs(ox-x) > 1 || abs(oy-y) > 1) {
41- if (!state->sflags[i] & S_TRACK)
42+ if (!(state->sflags[i] & S_TRACK))
43 did += solve_set_sflag(state, x, y, S_NOTRACK, what);
44 }
45 }
46--
471.9.1
48
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 6148e40ada..6574e1dba4 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -13,7 +13,6 @@ SRC_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-Clarify-conditions-to-avoid-compiler-errors.patch \
17 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 \
18 " 17 "
19UPSTREAM_CHECK_COMMITS = "1" 18UPSTREAM_CHECK_COMMITS = "1"