From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: buildroot@buildroot.org
Cc: Eric Limpens <limpens@gmail.com>,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
linux-amarula@amarulasolutions.com
Subject: [Buildroot] [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0
Date: Sun, 7 Jul 2024 14:31:29 +0200 [thread overview]
Message-ID: <20240707123129.4045342-1-dario.binacchi@amarulasolutions.com> (raw)
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
next reply other threads:[~2024-07-07 12:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-07 12:31 Dario Binacchi [this message]
2024-07-08 20:21 ` [Buildroot] [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0 Thomas Petazzoni via buildroot
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=20240707123129.4045342-1-dario.binacchi@amarulasolutions.com \
--to=dario.binacchi@amarulasolutions.com \
--cc=buildroot@buildroot.org \
--cc=limpens@gmail.com \
--cc=linux-amarula@amarulasolutions.com \
/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.