bootstrap: Fix patching warnings
PATCH 1/1 bootstrap: Fix patching warnings
Currently bootstrap complains in the following way when patching gnulib files:
patching file argp-help.c
Hunk #1 succeeded at 52 (offset 1 line).
Hunk #2 succeeded at 1548 (offset 115 lines).
patching file mbswidth.c
patching file mbswidth.h
Hunk #1 succeeded at 40 (offset -5 lines).
Let's fix it by amending line numbers in the patch.
--- grub-core/lib/gnulib-patches/fix-width.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
grub-core/lib/gnulib-patches/fix-width.patch +3 -3
@@ -143,7 +143,7 @@ diff --git a/lib/argp-help.c b/lib/argp-help.c index e5375a0f0..5d8f451ec 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c -@@ -51,6 +51,7 @@ +@@ -52,6 +52,7 @@ #include "argp.h" #include "argp-fmtstream.h" #include "argp-namefrob.h"
@@ -151,7 +151,7 @@ index e5375a0f0..5d8f451ec 100644 #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) -@@ -1432,7 +1433,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, +@@ -1547,7 +1548,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, /* Manually do line wrapping so that it (probably) won't get wrapped at any embedded spaces. */
@@ -204,7 +204,7 @@ diff --git a/lib/mbswidth.h b/lib/mbswidth.h index 2b5c53c37..45a123e63 100644 --- a/lib/mbswidth.h +++ b/lib/mbswidth.h -@@ -45,6 +45,10 @@ extern "C" { +@@ -40,6 +40,10 @@ extern "C" { control characters and 1 otherwise. */ #define MBSW_REJECT_UNPRINTABLE 2
Signature · 1 line
2.11.0
Quoted 10 lines · Daniel Kiper
Currently bootstrap complains in the following way when patching gnulib files:
patching file
argp-help.c
Hunk #1 succeeded at 52 (offset 1 line).
Hunk #2 succeeded at 1548 (offset 115 lines).
patching filembswidth.c
patching filembswidth.h
Hunk #1 succeeded at 40 (offset -5 lines).
Quoted 3 lines
Let's fix it by amending line numbers in the patch.
Signed-off-by Daniel Kiper <[email protected]>
Looks good to me!
Quoted 38 lines
--- grub-core/lib/gnulib-patches/fix-width.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)grub-core/lib/gnulib-patches/fix-width.patch +3
-3@@ -143,7 +143,7 @@ diff --git a/lib/argp-help.c b/lib/argp-help.c index e5375a0f0..5d8f451ec 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c -@@ -51,6 +51,7 @@ +@@ -52,6 +52,7 @@ #include "argp.h" #include "argp-fmtstream.h" #include "argp-namefrob.h"@@ -151,7 +151,7 @@ index e5375a0f0..5d8f451ec 100644 #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) -@@ -1432,7 +1433,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, +@@ -1547,7 +1548,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, /* Manually do line wrapping so that it (probably) won't get wrapped at any embedded spaces. */@@ -204,7 +204,7 @@ diff --git a/lib/mbswidth.h b/lib/mbswidth.h index 2b5c53c37..45a123e63 100644 --- a/lib/mbswidth.h +++ b/lib/mbswidth.h -@@ -45,6 +45,10 @@ extern "C" { +@@ -40,6 +40,10 @@ extern "C" { control characters and 1 otherwise. */ #define MBSW_REJECT_UNPRINTABLE 2Signature · 1 line
2.11.0
Quoted 11 lines · Alec Brown
Quoted 10 lines · Daniel Kiper
Currently bootstrap complains in the following way when patching gnulib files:
patching file
argp-help.c
Hunk #1 succeeded at 52 (offset 1 line).
Hunk #2 succeeded at 1548 (offset 115 lines).
patching filembswidth.c
patching filembswidth.h
Hunk #1 succeeded at 40 (offset -5 lines).
Quoted 7 lines
Quoted 3 lines
Let's fix it by amending line numbers in the patch.
Signed-off-by Daniel Kiper <[email protected]>Looks good to me!
Reviewed-by Alec Brown <[email protected]>
Thank you!
Daniel