[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#37693] Seahorse build
From: |
Miguel Arruga Vivas |
Subject: |
[bug#37693] Seahorse build |
Date: |
Mon, 21 Oct 2019 17:25:12 +0200 |
Hi,
I've hit the same issue, although I tacked it differently because I
updated to 3.30.1.1. As I didn't knew about this patch, I did it by
myself, but I wouldn't upload it without changing the authorship.
Tue, 15 Oct 2019 14:36:01 +0200 Leo Prikler:
> Am Dienstag, den 15.10.2019, 14:09 +0200 schrieb Ludovic Courtès:
> > > - (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”. :-)
> Yes, Seahorse 3.30 no longer builds using Autotools.
I agree.
> > > (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?
>
> Indeed. After changing the build system, I've repeatedly run "guix
> build seahorse" and added the inputs that the build system complained
> about until the build succeeded. ("gtk+:bin" is necessary due to the
> icon cache IIRC).
I've solved this modifying the %standard-phases, as in other packages
from gnome.
> > 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.
>
> These patches come from Seahorse upstream.
> seahorse-fix-libsecret-breakage.patch was taken from [1], with its
> offset adjusted.
> seahorse-fix-type-mismatches.patch was taken from [2] as-is.
> The latter appears to be fixed in 3.32 (and also some versions prior),
> the former in 3.34.
>
> All the best,
> Leo
>
> [1]
> https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667
> [2] https://gitlab.gnome.org/GNOME/seahorse/merge_requests/31
I don't have the last one because it is fixed with 3.30.1.1. Also, I
have an extra python that could be a leftover.
Best regards,
Miguel
0001-gnu-seahorse-Update-to-3.30.1.1.patch
Description: Text Data