Re: [scarthgap][PATCH 2/2] ghostscript: fix build with gcc-15 on host

[Mikko Rapeli <mikko.rapeli@linaro.org>]

Hi,

On Tue, Apr 28, 2026 at 08:52:37AM +0200, Martin Jansa wrote:
> On Tue, Apr 28, 2026 at 8:46 AM Mikko Rapeli <mikko.rapeli@linaro.org> wrote:
> >
> > From: Martin Jansa <martin.jansa@gmail.com>
> >
> > (From OE-Core rev: 02e282f6417274a93c6f01978bf33e2d171297b0)
> >
> > Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> > ---
> >  ...Fix-compatibility-with-C23-compilers.patch | 67 +++++++++++++++++++
> >  .../ghostscript/ghostscript_10.05.1.bb        |  4 +-
> >  2 files changed, 68 insertions(+), 3 deletions(-)
> >  create mode 100644 meta/recipes-extended/ghostscript/ghostscript/0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch
> ...
> > diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
> > index 57a1098521..8f132d55c6 100644
> > --- a/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
> > +++ b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
> > @@ -25,9 +25,7 @@ def gs_verdir(v):
> >  SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
> >             file://ghostscript-9.16-Werror-return-type.patch \
> >             file://avoid-host-contamination.patch \
> > -           file://CVE-2025-59798.patch \
> > -           file://CVE-2025-59799.patch \
> > -           file://CVE-2025-59800.patch \
> > +           file://0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch \
> >             "
> 
> This part doesn't look right, did you remove CVE patches by accident
> when resolving conflict?

Thanks! Completely wrong conflict resolution. Need more coffee...

Cheers,

-Mikko