diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-12 19:14:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:25:49 +0000 |
commit | 03b8eb9fe1fc118efd5d64d79933341d22fb3437 (patch) | |
tree | b6daa2e0bf4e169555c98018f4fb7781bb10835b /meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch | |
parent | 2bb1f5362ba675e0b07b2bae2ce0c0b8ba6ed5d9 (diff) | |
download | poky-03b8eb9fe1fc118efd5d64d79933341d22fb3437.tar.gz |
puzzles: update to latest revision
Remove 0001-Use-labs-instead-of-abs.patch as problem is fixed upstream.
(From OE-Core rev: 6ecc17f83d57d08bbeb6366cb586993a8844c8a6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch')
-rw-r--r-- | meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch | 23 |
1 files changed, 12 insertions, 11 deletions
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 index c134acde2f..28040523d4 100644 --- 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 | |||
@@ -1,4 +1,7 @@ | |||
1 | gtk.c: fix compiling failure with option -g -O | 1 | From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Mon, 11 Aug 2014 12:39:53 +0800 | ||
4 | Subject: [PATCH] gtk.c: fix compiling failure with option -g -O | ||
2 | 5 | ||
3 | There were compiling failure with option -g -O | 6 | There were compiling failure with option -g -O |
4 | ... | 7 | ... |
@@ -21,23 +24,21 @@ Initialized pointer 'cr' and 'error' with NULL | |||
21 | Upstream-Status: Pending | 24 | Upstream-Status: Pending |
22 | 25 | ||
23 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 26 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
27 | |||
24 | --- | 28 | --- |
25 | gtk.c | 4 ++-- | 29 | gtk.c | 2 +- |
26 | 1 file changed, 2 insertions(+), 2 deletions(-) | 30 | 1 file changed, 1 insertion(+), 1 deletion(-) |
27 | 31 | ||
28 | diff --git a/gtk.c b/gtk.c | 32 | diff --git a/gtk.c b/gtk.c |
29 | index a2eba2c..c54bf63 100644 | 33 | index 4565836..5e83b48 100644 |
30 | --- a/gtk.c | 34 | --- a/gtk.c |
31 | +++ b/gtk.c | 35 | +++ b/gtk.c |
32 | @@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) | 36 | @@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu) |
33 | int main(int argc, char **argv) | 37 | int main(int argc, char **argv) |
34 | { | 38 | { |
35 | char *pname = argv[0]; | 39 | char *pname = argv[0]; |
36 | - char *error; | 40 | - char *error; |
37 | + char *error = NULL; | 41 | + char *error = NULL; |
38 | int ngenerate = 0, print = FALSE, px = 1, py = 1; | 42 | int ngenerate = 0, px = 1, py = 1; |
39 | int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE; | 43 | bool print = false; |
40 | int soln = FALSE, colour = FALSE; | 44 | bool time_generation = false, test_solve = false, list_presets = false; |
41 | -- | ||
42 | 1.9.1 | ||
43 | |||