All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 13/30] puzzles: update to latest revision
Date: Thu, 12 Dec 2019 19:14:19 +0100	[thread overview]
Message-ID: <20191212181436.1322-13-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191212181436.1322-1-alex.kanavin@gmail.com>

Remove 0001-Use-labs-instead-of-abs.patch as problem is fixed upstream.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../files/0001-Use-labs-instead-of-abs.patch  | 46 -------------------
 ...isade-Fix-warnings-with-clang-on-arm.patch | 24 ++++------
 ...-string-lenght-parameter-to-be-size_.patch | 23 +++++-----
 ...ix-compiling-failure-with-option-g-O.patch | 23 +++++-----
 meta/recipes-sato/puzzles/puzzles_git.bb      |  3 +-
 5 files changed, 35 insertions(+), 84 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch

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 f43d1df6cc8..00000000000
--- 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
index 5351f8eb4e0..143e898a513 100644
--- 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
@@ -1,7 +1,7 @@
-From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001
+From 453587d714473b806473b309727f865b673cbc06 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
+Subject: [PATCH] palisade: Fix warnings with clang on arm
 
 ARM treats 'char' as unsigned char when 'char' is not qualified with
 'signed' or 'unsigned' explicitly.
@@ -16,17 +16,16 @@ type 'clue' (aka 'char') is always false
 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
+index 6ffbf2d..8b54d42 100644
 --- a/palisade.c
 +++ b/palisade.c
-@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx)
+@@ -304,11 +304,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) {
@@ -40,8 +39,8 @@ index 984e616..2b9c25c 100644
              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;
+@@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx)
+     bool changed = false;
  
      for (i = 0; i < wh; ++i) {
 -        if (ctx->clues[i] == EMPTY) continue;
@@ -49,16 +48,16 @@ index 984e616..2b9c25c 100644
  
          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,
+@@ -538,7 +538,7 @@ static bool 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[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,
+@@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
      p = numbers;
      r = 0;
      for (i = 0; i < wh; ++i) {
@@ -67,6 +66,3 @@ index 984e616..2b9c25c 100644
              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
index 9ac62015d8c..7ca582fe5d6 100644
--- 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
@@ -1,4 +1,4 @@
-From 035467aa0abfbc0de7e5d24543d4aab37301593c Mon Sep 17 00:00:00 2001
+From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 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
@@ -11,23 +11,24 @@ pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and
 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
+index ffadd3f..4e5f187 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
+@@ -428,7 +428,7 @@ static bool 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
+                    , const char *rowcol, int index, int cluewid
 -- 
-2.21.0
+2.17.1
 
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 c134acde2f2..28040523d4f 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 @@
-gtk.c: fix compiling failure with option -g -O
+From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 11 Aug 2014 12:39:53 +0800
+Subject: [PATCH] gtk.c: fix compiling failure with option -g -O
 
 There were compiling failure with option -g -O
 ...
@@ -21,23 +24,21 @@ 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(-)
+ gtk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gtk.c b/gtk.c
-index a2eba2c..c54bf63 100644
+index 4565836..5e83b48 100644
 --- a/gtk.c
 +++ b/gtk.c
-@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp)
+@@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu)
  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
-
+     int ngenerate = 0, px = 1, py = 1;
+     bool print = false;
+     bool time_generation = false, test_solve = false, list_presets = false;
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 5ee9164b85f..57f2af48eb8 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -10,7 +10,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            file://fix-compiling-failure-with-option-g-O.patch \
-           file://0001-Use-labs-instead-of-abs.patch \
            file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
            file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
            file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \
@@ -18,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025"
+SRCREV = "1c0c49dd5cd8df6ae87f7be5371be84589fa2662"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
-- 
2.17.1



  parent reply	other threads:[~2019-12-12 18:14 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-12 18:14 [PATCH 01/30] rpm: upgrade to 4.15.1 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 02/30] gettext-minimal-native: update to 0.20.1 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 03/30] gettext: " Alexander Kanavin
2019-12-15 11:03   ` Richard Purdie
2019-12-16 13:25     ` Alexander Kanavin
2019-12-17 16:02       ` Alexander Kanavin
2019-12-20  8:18         ` Khem Raj
2019-12-20 13:10           ` Alexander Kanavin
2020-01-01  3:47             ` Khem Raj
2019-12-12 18:14 ` [PATCH 04/30] psmisc: revert to default autopoint exclusion Alexander Kanavin
2019-12-12 18:14 ` [PATCH 05/30] gettext: fix failing ptests Alexander Kanavin
2019-12-12 18:14 ` [PATCH 06/30] python3: update to 3.8.0 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2019-12-15  5:21   ` Khem Raj
2019-12-15 11:00     ` Alexander Kanavin
2019-12-15 17:06       ` Khem Raj
2019-12-15 17:12         ` Alexander Kanavin
2019-12-15 17:32           ` Khem Raj
2019-12-15 17:52             ` Carlos Rafael Giani
2019-12-15 18:10               ` Alexander Kanavin
2019-12-12 18:14 ` [PATCH 08/30] shadow: update 4.6 -> 4.8 Alexander Kanavin
2019-12-17  8:51   ` Richard Purdie
2019-12-12 18:14 ` [PATCH 09/30] sysklogd: update to 2.0.3 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 10/30] libtasn1: update to 4.15.0 Alexander Kanavin
2019-12-17  8:53   ` Richard Purdie
2019-12-12 18:14 ` [PATCH 11/30] sysklogd: Fix 2.0.3 upgrade fallouts on musl Alexander Kanavin
2019-12-12 18:14 ` [PATCH 12/30] dos2unix: update to 7.4.1 Alexander Kanavin
2019-12-12 18:14 ` Alexander Kanavin [this message]
2019-12-12 18:14 ` [PATCH 14/30] glide: update to 0.13.3 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 15/30] bluez: update 5.50 -> 5.52 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 16/30] bluez5: disable debug output in ptests Alexander Kanavin
2019-12-12 18:14 ` [PATCH 17/30] libxml2: update to 2.9.10 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 18/30] parted: update 3.2->3.3 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 19/30] acl/attr: update to latest upstream releases Alexander Kanavin
2019-12-14 20:24   ` Khem Raj
2019-12-14 20:48     ` Alexander Kanavin
2019-12-12 18:14 ` [PATCH 20/30] lttng-modules: update to 2.11.0 Alexander Kanavin
2019-12-15 12:53   ` Richard Purdie
2019-12-15 16:20     ` Alexander Kanavin
2019-12-15 16:27       ` Bruce Ashfield
2019-12-15 16:45         ` Alexander Kanavin
2019-12-15 17:16           ` Richard Purdie
2019-12-15 17:24             ` Alexander Kanavin
2019-12-12 18:14 ` [PATCH 21/30] lttng-ust: " Alexander Kanavin
2019-12-15  5:26   ` Khem Raj
2019-12-12 18:14 ` [PATCH 22/30] lttng-tools: " Alexander Kanavin
2019-12-12 18:14 ` [PATCH 23/30] cups: update to 2.3.0 Alexander Kanavin
2019-12-13  2:55   ` Mittal, Anuj
2019-12-13 11:50     ` Alexander Kanavin
2019-12-12 18:14 ` [PATCH 24/30] man-pages: update to 5.04 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 25/30] man-db: update to 2.9.0 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 26/30] ltp: update to 20190930 Alexander Kanavin
2019-12-15  5:32   ` Khem Raj
2019-12-15 11:02     ` Alexander Kanavin
2019-12-15 17:11       ` Khem Raj
2019-12-15 17:15         ` Alexander Kanavin
2019-12-12 18:14 ` [PATCH 27/30] cpio: update to 2.13 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 28/30] sudo: update to 1.8.29 Alexander Kanavin
2019-12-12 18:14 ` [PATCH 29/30] nfs-utils: update to 2.4.2 Alexander Kanavin
2019-12-15  5:23   ` Khem Raj
2019-12-12 18:14 ` [PATCH 30/30] debianutils: update to 4.9.1 Alexander Kanavin
2019-12-12 18:32 ` ✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 29 more Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191212181436.1322-13-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.