diff mbox series

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

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

Commit Message

Dario Binacchi July 2, 2024, 1:39 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, sdl_mixer fails to build with output:

    Applying 0002-configure__set_macro_directory.patch using patch:
    patching file configure.ac
    Hunk #1 FAILED at 2.
    1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../sdl_mixer/0002-configure__set_macro_directory.patch   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

'Abel Vesa' via Amarula Linux July 2, 2024, 7:42 p.m. UTC | #1 
On 02/07/2024 15:39, 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, sdl_mixer fails to build with output:
> 
>      Applying 0002-configure__set_macro_directory.patch using patch:
>      patching file configure.ac
>      Hunk #1 FAILED at 2.
>      1 out of 1 hunk FAILED -- saving rejects to file configure.ac.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

> ---
>   .../sdl_mixer/0002-configure__set_macro_directory.patch   | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/package/sdl_mixer/0002-configure__set_macro_directory.patch b/package/sdl_mixer/0002-configure__set_macro_directory.patch
> index 9802333a1d4d..cad9baa9c31f 100644
> --- a/package/sdl_mixer/0002-configure__set_macro_directory.patch
> +++ b/package/sdl_mixer/0002-configure__set_macro_directory.patch
> @@ -20,13 +20,15 @@ Fixes:
>       libtool: and run autoconf again.
>   
>   Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>   
>   diff --git a/configure.ac b/configure.ac
>   --- a/configure.ac
>   +++ b/configure.ac
> -@@ -1,6 +1,7 @@
> - dnl Process this file with autoconf to produce a configure script.
> - AC_INIT(README)
> +@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
> + AC_INIT
> + AC_CONFIG_SRCDIR([mixer.c])
>    AC_CONFIG_AUX_DIR(build-scripts)
>   +AC_CONFIG_MACRO_DIR([acinclude])
>    

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/sdl_mixer/0002-configure__set_macro_directory.patch b/package/sdl_mixer/0002-configure__set_macro_directory.patch
index 9802333a1d4d..cad9baa9c31f 100644
--- a/package/sdl_mixer/0002-configure__set_macro_directory.patch
+++ b/package/sdl_mixer/0002-configure__set_macro_directory.patch
@@ -20,13 +20,15 @@  Fixes:
     libtool: and run autoconf again.
 
 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(README)
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT
+ AC_CONFIG_SRCDIR([mixer.c])
  AC_CONFIG_AUX_DIR(build-scripts)
 +AC_CONFIG_MACRO_DIR([acinclude])