[1/1] package/sane-backends: update the patches to be applied with fuzz 0
diff mbox series

Message ID 20240707120650.4036307-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/1] package/sane-backends: update the patches to be applied with fuzz 0
Related show

Commit Message

Dario Binacchi July 7, 2024, 12:06 p.m. UTC 
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, sane-backends fails to build with output:

    Applying 0001-sane_backend-add-missing-config.h.patch using patch:
    patching file include/sane/sanei_backend.h
    Hunk #1 FAILED at 8.
    1 out of 1 hunk FAILED -- saving rejects to file include/sane/sanei_backend.h.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0001-sane_backend-add-missing-config.h.patch            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

'Jan Kiszka' via Amarula Linux July 8, 2024, 8:21 p.m. UTC | #1 
On Sun,  7 Jul 2024 14:06:50 +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, sane-backends fails to build with output:
> 
>     Applying 0001-sane_backend-add-missing-config.h.patch using patch:
>     patching file include/sane/sanei_backend.h
>     Hunk #1 FAILED at 8.
>     1 out of 1 hunk FAILED -- saving rejects to file include/sane/sanei_backend.h.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  .../0001-sane_backend-add-missing-config.h.patch            | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Patch
diff mbox series 

diff --git a/package/sane-backends/0001-sane_backend-add-missing-config.h.patch b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
index 8e56b0284b5f..f3796933381e 100644
--- a/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
+++ b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
@@ -28,6 +28,8 @@  Fixes:
 http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf
 
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  include/sane/sanei_backend.h | 1 +
  1 file changed, 1 insertion(+)
@@ -42,8 +44,8 @@  index 1b5afe2..2a96532 100644
  
 +#include "../include/sane/config.h"
  
- /*
-  * Compiler related options
+ /** @name Compatibility macros
+  * @{
 -- 
 2.5.5