[Buildroot] [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0

[Buildroot] [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0

[Dario Binacchi]

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, ympd fails to build with output:

    Applying 0002-added-forward-declarations.patch using patch:
    patching file src/mpd_client.c
    Hunk #1 succeeded at 29 (offset -1 lines).
    patching file src/mpd_client.h
    Hunk #1 FAILED at 96.
    1 out of 1 hunk FAILED -- saving rejects to file src/mpd_client.h.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/ympd/0002-added-forward-declarations.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/ympd/0002-added-forward-declarations.patch b/package/ympd/0002-added-forward-declarations.patch
index 90ee1eae6868..d96307d2a472 100644
--- a/package/ympd/0002-added-forward-declarations.patch
+++ b/package/ympd/0002-added-forward-declarations.patch
@@ -8,6 +8,8 @@ Subject: [PATCH] added forward declarations
 from:
 https://github.com/notandy/ympd/pull/191/commits/2268e0f0f372a61827b912155a1796490968b3ff]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/mpd_client.c | 2 ++
  src/mpd_client.h | 6 ++++--
@@ -17,7 +19,7 @@ diff --git a/src/mpd_client.c b/src/mpd_client.c
 index 2911e461..9f003ab0 100644
 --- a/src/mpd_client.c
 +++ b/src/mpd_client.c
-@@ -30,6 +30,8 @@
+@@ -29,6 +29,8 @@
  
  /* forward declaration */
  static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
@@ -30,7 +32,7 @@ diff --git a/src/mpd_client.h b/src/mpd_client.h
 index 447dd563..9342c550 100644
 --- a/src/mpd_client.h
 +++ b/src/mpd_client.h
-@@ -96,6 +96,8 @@ struct t_mpd {
+@@ -92,7 +92,9 @@
  
      int song_id;
      unsigned queue_version;
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0

[Thomas Petazzoni via buildroot]

On Sun,  7 Jul 2024 14:31:29 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, ympd fails to build with output:
> 
>     Applying 0002-added-forward-declarations.patch using patch:
>     patching file src/mpd_client.c
>     Hunk #1 succeeded at 29 (offset -1 lines).
>     patching file src/mpd_client.h
>     Hunk #1 FAILED at 96.
>     1 out of 1 hunk FAILED -- saving rejects to file src/mpd_client.h.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  package/ympd/0002-added-forward-declarations.patch | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot