Index | Thread | Search

From:
"Marco van Hulten" <marco@hulten.org>
Subject:
Re: [update] geo/eccodes-2.44.0
To:
"Martin Reindl" <martin@catai.org>, <ports@openbsd.org>
Date:
Sun, 07 Dec 2025 15:10:45 +0100

Download raw body.

Thread
Hi Martin,

On Sat Dec 6, 2025 at 7:21 PM CET, Martin Reindl wrote:
> Am 06.12.25 um 14:08 schrieb Marco van Hulten:
>> On Sun Oct 19, 2025 at 6:03 PM CEST, Marco van Hulten wrote:
>>> Update to actual release of ecCodes.
>>>
>>> OK?
>> 
>> Ping.
>> 
>> Now I fully removed the prerelease option.
>
> Hi Marco,
>
> does not apply correctly:
>
> $ patch -p1 </home/martin/eccodes2550.diff
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff -r 65f303ad0e98 geo/eccodes/Makefile
> |--- a/geo/eccodes/Makefile	Wed Oct 15 19:12:24 2025 +0200
> |+++ b/geo/eccodes/Makefile	Sat Dec 06 12:55:58 2025 +0100
> --------------------------
> Patching file geo/eccodes/Makefile using Plan A...
> Hunk #1 succeeded at 4 with fuzz 1 (offset 3 lines).
> Hunk #2 succeeded at 29 (offset 3 lines).
> Hunk #3 succeeded at 43 (offset 3 lines).
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff -r 65f303ad0e98 geo/eccodes/distinfo
> |--- a/geo/eccodes/distinfo	Wed Oct 15 19:12:24 2025 +0200
> |+++ b/geo/eccodes/distinfo	Sat Dec 06 12:55:58 2025 +0100
> --------------------------
> Patching file geo/eccodes/distinfo using Plan A...
> Hunk #1 succeeded at 1.
> Hmm...  Ignoring the trailing garbage.
> done

This output looks to me that it applies correctly, except maybe that
patch(1) has to guess what kind of diff it is and ignore garbage.
According to patch(1) this should not be a problem.  Nonetheless, if
there is a chance this being problematic and I could avoid it,
enlightenment would be welcome.

When I apply my patch, I get the the same output as you, except for the
trailing garbage message.  I copied that very patch file into the e-mail
body (by opening the unified diff file in a split window in neovim that
is spawned by aerc(1)).  I guess something goes wrong near the end of
the body in this process or during conversion to e-mail format (CRLF and
7-bit encoding)?  (I should read aerc-patch(7).)

I tried to apply patches from three other updates sent during the
weekend.

- sysutils/libisofs     only partly succeeds
- databases/postgresql  completely fails
- archivers/brotli      says it is a malformed patch

I think I'm doing it wrong.  All of them have the "Hmm..." messages,
which might be okay.

 Marco