diff options
Diffstat (limited to 'meta/recipes-sato/puzzles/files')
6 files changed, 0 insertions, 251 deletions
diff --git a/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch deleted file mode 100644 index d40a3b1ef9..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 21 Apr 2017 12:18:08 -0700 -Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it - -we need this warning to be suppressed with gcc7+ -however older compilers dont support it so we need -a way to disble it only if compiler supports it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3a38c95..bb9035e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ fi - if test "x$GCC" = "xyes"; then - AC_MSG_CHECKING([for usable gcc warning flags]) - gccwarningflags= -- for flag in -Wall -Werror -std=c89 -pedantic; do -+ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" --- -2.12.2 - diff --git a/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch deleted file mode 100644 index f43d1df6cc..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9808dc09e08937c9bffd858d3ded428225a4312a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Sep 2015 09:02:38 +0000 -Subject: [PATCH] Use labs instead of abs - -cluevals is array of longs so we have to use labs() instead of abs() -since abs() returns int - -Fixes - -keen.c:1458:17: error: absolute value function 'abs' given an argument -of type 'long' but has parameter of type 'int' which may cause -truncation of value - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - keen.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keen.c b/keen.c -index a6a7238..1631992 100644 ---- a/keen.c -+++ b/keen.c -@@ -1043,7 +1043,7 @@ done - cluevals[j] *= grid[i]; - break; - case C_SUB: -- cluevals[j] = abs(cluevals[j] - grid[i]); -+ cluevals[j] = labs(cluevals[j] - grid[i]); - break; - case C_DIV: - { -@@ -1455,7 +1455,7 @@ static int check_errors(const game_state *state, long *errors) - cluevals[j] *= state->grid[i]; - break; - case C_SUB: -- cluevals[j] = abs(cluevals[j] - state->grid[i]); -+ cluevals[j] = labs(cluevals[j] - state->grid[i]); - break; - case C_DIV: - { --- -2.5.1 - diff --git a/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch deleted file mode 100644 index 5351f8eb4e..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jan 2016 23:10:19 -0800 -Subject: [puzzles][PATCH] palisade: Fix warnings with clang on arm - -ARM treats 'char' as unsigned char when 'char' is not qualified with -'signed' or 'unsigned' explicitly. - -This results in warnings e.g. - -palisade.c:531:22: error: comparison of constant -1 with expression of -type 'clue' (aka 'char') is always false -[-Werror,-Wtautological-constant-out-of-range-compare] - if (clues[i] == EMPTY) continue; - -Therefore, typcast the contant to char in such places to be explicit - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - palisade.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/palisade.c b/palisade.c -index 984e616..2b9c25c 100644 ---- a/palisade.c -+++ b/palisade.c -@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) - * If p = q = 3 then the region has size exactly 2. */ - - for (i = 0; i < wh; ++i) { -- if (ctx->clues[i] == EMPTY) continue; -+ if (ctx->clues[i] == (char)EMPTY) continue; - for (dir = 0; dir < 4; ++dir) { - int j = i + dx[dir] + w*dy[dir]; - if (disconnected(ctx, i, j, dir)) continue; -- if (ctx->clues[j] == EMPTY) continue; -+ if (ctx->clues[j] == (char)EMPTY) continue; - if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) || - (ctx->clues[i] == 3 && ctx->clues[j] == 3 && - ctx->params->k != 2)) -@@ -317,7 +317,7 @@ static int solver_number_exhausted(solver_ctx *ctx) - int changed = FALSE; - - for (i = 0; i < wh; ++i) { -- if (ctx->clues[i] == EMPTY) continue; -+ if (ctx->clues[i] == (char)EMPTY) continue; - - if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) { - for (dir = 0; dir < 4; ++dir) { -@@ -528,7 +528,7 @@ static int is_solved(const game_params *params, clue *clues, - for (i = 0; i < wh; ++i) { - if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, TRUE); - if (dsf_size(dsf, i) != k) goto error; -- if (clues[i] == EMPTY) continue; -+ if (clues[i] == (char)EMPTY) continue; - if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error; - } - -@@ -674,7 +674,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, - p = numbers; - r = 0; - for (i = 0; i < wh; ++i) { -- if (numbers[i] != EMPTY) { -+ if (numbers[i] != (char)EMPTY) { - while (r) { - while (r > 26) { - *p++ = 'z'; --- -2.7.0 - diff --git a/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch b/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch deleted file mode 100644 index 9ac62015d8..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 035467aa0abfbc0de7e5d24543d4aab37301593c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Mar 2019 21:56:57 -0800 -Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in - do_row() - -This fixes below error on some architectures e.g. RISC-V - -pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] 455 | memset(deduced, DOT, (size_t)len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pattern.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pattern.c b/pattern.c -index 45b1b0c..f73a4c2 100644 ---- a/pattern.c -+++ b/pattern.c -@@ -428,7 +428,7 @@ static int do_row(unsigned char *known, unsigned char *deduced, - unsigned char *row, - unsigned char *minpos_done, unsigned char *maxpos_done, - unsigned char *minpos_ok, unsigned char *maxpos_ok, -- unsigned char *start, int len, int step, int *data, -+ unsigned char *start, size_t len, int step, int *data, - unsigned int *changed - #ifdef STANDALONE_SOLVER - , const char *rowcol, int index, int cluewid --- -2.21.0 - diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch deleted file mode 100644 index c134acde2f..0000000000 --- a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ /dev/null @@ -1,43 +0,0 @@ -gtk.c: fix compiling failure with option -g -O - -There were compiling failure with option -g -O -... -././gtk.c: In function 'configure_area': -././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized] - cairo_set_source_rgb(cr, - ^ -././gtk.c:384:14: note: 'cr' was declared here - cairo_t *cr; - ^ -././gtk.c: In function 'main': -././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized] - fprintf(stderr, "%s: %s\n", pname, error); - ^ -cc1: all warnings being treated as errors -... - -Initialized pointer 'cr' and 'error' with NULL - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gtk.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gtk.c b/gtk.c -index a2eba2c..c54bf63 100644 ---- a/gtk.c -+++ b/gtk.c -@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) - int main(int argc, char **argv) - { - char *pname = argv[0]; -- char *error; -+ char *error = NULL; - int ngenerate = 0, print = FALSE, px = 1, py = 1; - int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE; - int soln = FALSE, colour = FALSE; --- -1.9.1 - diff --git a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch deleted file mode 100644 index 7218d620ec..0000000000 --- a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch +++ /dev/null @@ -1,25 +0,0 @@ -puzzles: avoid compiler unitialized variable error - -The compiler does not realize that we must go through the while() -loop at least once, so we replace it with a for() loop. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/tree234.c -+++ b/tree234.c -@@ -326,8 +326,11 @@ static void *add234_internal(tree234 *t, - return orig_e; - } - -- n = t->root; -- while (n) { -+ /* -+ * We know t->root is not NULL. The logic -+ * to break out of this is at the end of the loop. -+ */ -+ for (n = t->root;;) { - LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", - n, - n->kids[0], n->counts[0], n->elems[0], |