From: Daniel Kiper Date: Thu, 15 Jun 2023 14:47:09 +0000 (+0200) Subject: bootstrap: Fix patching warnings X-Git-Tag: grub-2.12-rc1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c7578e7277013c62a210810bdf116dd641355de;p=thirdparty%2Fgrub.git 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. Signed-off-by: Daniel Kiper Reviewed-by: Alec Brown --- diff --git a/grub-core/lib/gnulib-patches/fix-width.patch b/grub-core/lib/gnulib-patches/fix-width.patch index 0a208ad08..15f091c0d 100644 --- a/grub-core/lib/gnulib-patches/fix-width.patch +++ b/grub-core/lib/gnulib-patches/fix-width.patch @@ -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