From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Cc: linux-amarula@amarulasolutions.com, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/pulseview: update the patches to be applied with fuzz 0
Date: Fri, 12 Jul 2024 16:52:55 +0200 [thread overview]
Message-ID: <20240712165255.4671c621@windsurf> (raw)
In-Reply-To: <20240705065121.3235358-1-dario.binacchi@amarulasolutions.com>
On Fri, 5 Jul 2024 08:51:21 +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, pulseview fails to build with output:
>
> Applying 0001-Replace-obsolete-deprecated-Qt-methods.patch using patch:
> patching file pv/util.cpp
> Hunk #2 succeeded at 175 (offset 4 lines).
> Hunk #3 succeeded at 285 (offset 4 lines).
> patching file pv/util.hpp
> Hunk #2 succeeded at 139 (offset 1 line).
> patching file pv/views/trace/decodetrace.cpp
> Hunk #1 FAILED at 103.
> 1 out of 1 hunk FAILED -- saving rejects to file pv/views/trace/decodetrace.cpp.rej
>
> Applying 0003-Support-glibmm-2.68.patch using patch:
> patching file CMakeLists.txt
> Hunk #3 FAILED at 231.
> Hunk #4 FAILED at 492.
> 2 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
>
> This commit refreshes the package patches on the current package version.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> .checkpackageignore | 1 -
> ...place-obsolete-deprecated-Qt-methods.patch | 32 ++++++++++---------
> .../pulseview/0003-Support-glibmm-2.68.patch | 22 +++++++------
> 3 files changed, 29 insertions(+), 26 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
prev parent reply other threads:[~2024-07-12 14:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 6:51 [Buildroot] [PATCH 1/1] package/pulseview: update the patches to be applied with fuzz 0 Dario Binacchi
2024-07-12 14:52 ` Thomas Petazzoni via buildroot [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240712165255.4671c621@windsurf \
--to=buildroot@buildroot.org \
--cc=dario.binacchi@amarulasolutions.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox