diff mbox series

[1/1] package/flite: update the patches to be applied with fuzz 0

Message ID 20240702072856.2376924-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/1] package/flite: update the patches to be applied with fuzz 0 |

Commit Message

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

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

    Applying 0001-fix-alsa-static.patch using patch:
    patching file configure.in
    Hunk #1 FAILED at 275.
    1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/flite/0001-fix-alsa-static.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

'Abel Vesa' via Amarula Linux July 2, 2024, 7:56 a.m. UTC | #1 
On 02/07/2024 09:28, Dario Binacchi wrote:
> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, flite fails to build with output:
> 
>      Applying 0001-fix-alsa-static.patch using patch:
>      patching file configure.in
>      Hunk #1 FAILED at 275.
>      1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/flite/0001-fix-alsa-static.patch | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/flite/0001-fix-alsa-static.patch b/package/flite/0001-fix-alsa-static.patch
> index 7ed4899cc4f7..83f0a86e4d14 100644
> --- a/package/flite/0001-fix-alsa-static.patch
> +++ b/package/flite/0001-fix-alsa-static.patch
> @@ -1,12 +1,14 @@
>   Use pkg-config to determine alsa link flags. This fixes static linking.
>   
>   Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>   
>   diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
>   --- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
>   +++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
> -@@ -275,7 +275,10 @@
> -                 #endif],
> +@@ -383,7 +383,10 @@ AC_CHECK_HEADER(sys/audioio.h,
> + AC_CHECK_HEADER(alsa/asoundlib.h,
>                  [AUDIODRIVER="alsa"
>    	       AUDIODEFS=-DCST_AUDIO_ALSA
>   -               AUDIOLIBS=-lasound])

To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff mbox series

Patch

diff --git a/package/flite/0001-fix-alsa-static.patch b/package/flite/0001-fix-alsa-static.patch
index 7ed4899cc4f7..83f0a86e4d14 100644
--- a/package/flite/0001-fix-alsa-static.patch
+++ b/package/flite/0001-fix-alsa-static.patch
@@ -1,12 +1,14 @@ 
 Use pkg-config to determine alsa link flags. This fixes static linking.
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
 --- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
 +++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
-@@ -275,7 +275,10 @@
-                 #endif],
+@@ -383,7 +383,10 @@ AC_CHECK_HEADER(sys/audioio.h,
+ AC_CHECK_HEADER(alsa/asoundlib.h,
                [AUDIODRIVER="alsa"
  	       AUDIODEFS=-DCST_AUDIO_ALSA
 -               AUDIOLIBS=-lasound])