Subject: Re: [bug#37693] Seahorse build

From: Ludovic Courtès <[email-masked]>
Date: Tue, 15 Oct 2019 14:09:00 +0200

Hi Leo,

Leo Prikler <[email-masked]> skribis:

> From e2b17f74841ae14ac96782539ec8bfc1c639ed34 Mon Sep 17 00:00:00 2001
> From: Leo Prikler <[email-masked]>
> Date: Thu, 10 Oct 2019 10:16:47 +0200
> Subject: [PATCH] gnu: seahorse: Fix build
>
> * /gnu/packages/gnome.scm: (seahorse): Use meson-build-system.
> Update inputs. Add patches to fix compile errors.
> * /gnu/packages/patches/seahorse-fix-libsecret-breakage.patch: New file.
> * /gnu/packages/patches/seahorse-fix-type-mismatches.patch: New file.

Great that you were able to fix it!

> -    (build-system glib-or-gtk-build-system)
> +         "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp"))
> +       (patches
> +        (search-patches "seahorse-fix-libsecret-breakage.patch"
> +                        "seahorse-fix-type-mismatches.patch"))))
> +    (build-system meson-build-system)

Is changing the build system necessary to fix the problems you
encountered, or is it a side change?  From the current build log at
<https://ci.guix.gnu.org/log/3j08dl90hlyq9haf9lh61k43fs60dcih-seahorse-3.30>,
it does seem that the answer is “yes”.  :-)

>      (inputs
> -     `(("gtk+" ,gtk+)
> +     `(("avahi" ,avahi)
> +       ("gtk+" ,gtk+)
>         ("gcr" ,gcr)
>         ("gnupg" ,gnupg)
>         ("gpgme" ,gpgme)
> @@ -2244,8 +2248,10 @@ engineering.")
>      (native-inputs
>       `(("intltool" ,intltool)
>         ("glib:bin" ,glib "bin")
> +       ("gtk+:bin" ,gtk+ "bin")
>         ("itstool" ,itstool)
>         ("pkg-config" ,pkg-config)
> +       ("vala" ,vala)

Likewise, these changes were necessary, right?

> diff --git a/gnu/packages/patches/seahorse-fix-libsecret-breakage.patch b/gnu/packages/patches/seahorse-fix-libsecret-breakage.patch
> new file mode 100644
> index 0000000000..d6396c227a
> --- /dev/null
> +++ b/gnu/packages/patches/seahorse-fix-libsecret-breakage.patch

[...]

> --- /dev/null
> +++ b/gnu/packages/patches/seahorse-fix-type-mismatches.patch
> @@ -0,0 +1,154 @@
> +From 12178d7cc7fad52f61003b3221bd0a713ef80507 Mon Sep 17 00:00:00 2001
> +From: Rico Tzschichholz <[email-masked]>
> +Date: Mon, 5 Nov 2018 09:59:27 +0100
> +Subject: [PATCH] Fix type-argument mismatches related to GLib.List

One last thing: are those patches upstream, or is there a bug report
where they were discussed?

If so could you share the URLs?  I can add them on your behalf in the
.patch file if you want.  That’ll allow us to better keep track of where
our patches come from and when we can remove them.

Thanks!

Ludo’.