diff mbox series

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

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

Commit Message

Dario Binacchi July 7, 2024, 9:14 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, libgdiplus fails to build with output:

    Applying 0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch using patch:
    patching file Makefile.am
    patching file configure.ac
    Hunk #1 FAILED at 39.
    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>
---
 ...ild-unit-tests-only-when-enable-unit-tests-is-pass.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

'Abel Vesa' via Amarula Linux July 8, 2024, 8:21 p.m. UTC | #1 
On Sun,  7 Jul 2024 11:14:37 +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, libgdiplus fails to build with output:
> 
>     Applying 0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch using patch:
>     patching file Makefile.am
>     patching file configure.ac
>     Hunk #1 FAILED at 39.
>     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>
> ---
>  ...ild-unit-tests-only-when-enable-unit-tests-is-pass.patch | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch
index 33746872ac0d..0ac5ecaad03f 100644
--- a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch
+++ b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch
@@ -11,6 +11,8 @@  So let's disable the build of unit tests by default and introduce
 
 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
 Upstream: https://github.com/mono/libgdiplus/pull/701
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  Makefile.am  | 8 ++++++--
  configure.ac | 4 ++++
@@ -38,8 +40,8 @@  diff --git a/configure.ac b/configure.ac
 index 098fd0a664bd..c126ff091e58 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -39,6 +39,10 @@ if test $warnaserror = "yes"; then
-   GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered -Wno-typedef-redefinition"
+@@ -47,6 +47,10 @@
+   GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered"
  fi
  
 +AC_ARG_ENABLE(unittests, AS_HELP_STRING([--enable-unittests],[Enable building unit tests.]),[unittests=yes],[unittests=no])