Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libgdiplus: update the patches to be applied with fuzz 0
@ 2024-07-07  9:14 Dario Binacchi
  2024-07-08 20:21 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Dario Binacchi @ 2024-07-07  9:14 UTC (permalink / raw)
  To: buildroot; +Cc: linux-amarula, Dario Binacchi, Sergio Prado

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(-)

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])
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/libgdiplus: update the patches to be applied with fuzz 0
  2024-07-07  9:14 [Buildroot] [PATCH 1/1] package/libgdiplus: update the patches to be applied with fuzz 0 Dario Binacchi
@ 2024-07-08 20:21 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-08 20:21 UTC (permalink / raw)
  To: Dario Binacchi; +Cc: Sergio Prado, linux-amarula, buildroot

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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-07-08 20:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-07  9:14 [Buildroot] [PATCH 1/1] package/libgdiplus: update the patches to be applied with fuzz 0 Dario Binacchi
2024-07-08 20:21 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox