Subject: Re: bug#61270: [PATCH] gnu: dbacl: Fix failing check phase.
From: Maxim Cournoyer <[email-masked]>
To: "Danny O'Brien" <[email-masked]>
Cc: Tobias Geerinckx-Rice <[email-masked]>, Ludovic Courtès <[email-masked]>, [email-masked], [email-masked]
Date: Tue, 21 Mar 2023 22:13:21 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

"Danny O'Brien" <[email-masked]> writes:

> On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Courtès wrote:
>> Hi Danny,
>> 
>> "Danny O'Brien" <[email-masked]> skribis:
>> 
>> > Yep, that was all due to `guix style` — the instructions say to run it, but
>> > that may be different if it's just tweaking an existing hand-crafted
>> > package description. I'll re-submit.
>> 
>> Did you get a chance to look into it?  We’re close to the finish line!
>> 
>> TIA,
>> Ludo’.
>
> Let's try this:
>

[...]

> diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
> index e5d3a0efc0..1092f1860b 100644
> --- a/gnu/packages/textutils.scm
> +++ b/gnu/packages/textutils.scm
> @@ -25,6 +25,7 @@
>  ;;; Copyright © 2021 Felix Gruber <[email-masked]>
>  ;;; Copyright © 2021 Bonface Munyoki Kilyungi <[email-masked]>
>  ;;; Copyright © 2022 Gabriel Wicki <[email-masked]>
> +;;; Copyright © 2022 Danny O'Brien <[email-masked]>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -711,7 +712,7 @@ (define-public dbacl
>                             "dbacl-" version ".tar.gz"))
>         (sha256
>          (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
> -       (patches (search-patches "dbacl-include-locale.h.patch"))))
> +       (patches (search-patches "dbacl-include-locale.h.patch" "dbacl-icheck-multiple-definitions.patch"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:make-flags

I've installed this change, but dropped your copyright line, as changes
smaller than 10-15 lines of new code are not subjected to copyright.

-- 
Thanks,
Maxim