GNU bug report logs - #37693
Seahorse build

Previous Next

Package: guix-patches;

Reported by: Leo Prikler <leo.prikler <at> student.tugraz.at>

Date: Thu, 10 Oct 2019 14:27:03 UTC

Severity: normal

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 37693 in the body.
You can then email your comments to 37693 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Thu, 10 Oct 2019 14:27:03 GMT) Full text and rfc822 format available.

Acknowledgement sent to Leo Prikler <leo.prikler <at> student.tugraz.at>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 10 Oct 2019 14:27:03 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: guix-patches <at> gnu.org
Subject: Seahorse build
Date: Thu, 10 Oct 2019 10:56:44 +0200
[Message part 1 (text/plain, inline)]

[0001-gnu-seahorse-Fix-build.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Sun, 13 Oct 2019 16:10:01 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: guix-patches <at> gnu.org
Subject: Re: Seahorse build
Date: Sun, 13 Oct 2019 14:35:54 +0200
[Message part 1 (text/plain, inline)]
This is a fixup to the previous patch, which adds the patches to
gnu/local.mk.

Unfortunately, the message I've sent along with the previous patch went
missing, so I'm trying to reconstruct it here:
"This patch fixes the currently broken Seahorse build. Seahorse has
switched to the Meson build system upstream, so this change is
reflected in the package and inputs were adjusted. Two upstream patches
are also applied, one of them with adjusted offset."
[0002-gnu-add-seahorse-patches-to-local.mk.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Tue, 15 Oct 2019 12:10:01 GMT) Full text and rfc822 format available.

Message #11 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Leo Prikler <leo.prikler <at> student.tugraz.at>
Cc: 37693 <at> debbugs.gnu.org
Subject: Re: [bug#37693] Seahorse build
Date: Tue, 15 Oct 2019 14:09:00 +0200
Hi Leo,

Leo Prikler <leo.prikler <at> student.tugraz.at> skribis:

> From e2b17f74841ae14ac96782539ec8bfc1c639ed34 Mon Sep 17 00:00:00 2001
> From: Leo Prikler <leo.prikler <at> student.tugraz.at>
> 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 <ricotz <at> ubuntu.com>
> +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’.




Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Tue, 15 Oct 2019 12:37:04 GMT) Full text and rfc822 format available.

Message #14 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 37693 <at> debbugs.gnu.org
Subject: Re: [bug#37693] Seahorse build
Date: Tue, 15 Oct 2019 14:36:01 +0200
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.

> >      (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).

> 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





Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Mon, 21 Oct 2019 15:26:01 GMT) Full text and rfc822 format available.

Message #17 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Miguel Arruga Vivas <rosen644835 <at> gmail.com>
To: 37693 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>,
 Leo Prikler <leo.prikler <at> student.tugraz.at>
Subject: [bug#37693] Seahorse build
Date: Mon, 21 Oct 2019 17:25:12 +0200
[Message part 1 (text/plain, inline)]
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 (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Mon, 21 Oct 2019 16:23:01 GMT) Full text and rfc822 format available.

Message #20 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: Miguel Arruga Vivas <rosen644835 <at> gmail.com>, 37693 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: Re: [bug#37693] Seahorse build
Date: Mon, 21 Oct 2019 18:22:16 +0200
Am Montag, den 21.10.2019, 17:25 +0200 schrieb Miguel Arruga Vivas:
> > > >      (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.
I'm not sure, whether that is the right approach. Seahorse used glib-
or-gtk-build-system before, so I would assume the generation of those
caches is expected.

> 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.
Would you mind checking, whether your patch works with gtk+:bin added
and without python? If so, I'd find it preferable to mine.

Regards,

Leo





Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Mon, 21 Oct 2019 17:00:02 GMT) Full text and rfc822 format available.

Message #23 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Miguel <rosen644835 <at> gmail.com>
To: Leo Prikler <leo.prikler <at> student.tugraz.at>
Cc: Ludovic Courtès <ludo <at> gnu.org>, 37693 <at> debbugs.gnu.org
Subject: Re: [bug#37693] Seahorse build
Date: Mon, 21 Oct 2019 18:59:39 +0200
Hi,

El 21 oct. 2019 18:22, Leo Prikler <leo.prikler <at> student.tugraz.at> escribió:
>
> Am Montag, den 21.10.2019, 17:25 +0200 schrieb Miguel Arruga Vivas: 
>>> > > > > @@ -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. 
> I'm not sure, whether that is the right approach. Seahorse used glib- 
> or-gtk-build-system before, so I would assume the generation of those 
> caches is expected. 

The icon.cache is generated later by a profile hook, as it must include all icons from the user-installed packages and not only seahorse ones. That's the reason behind its removal during installation phase.

> > 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. 
> Would you mind checking, whether your patch works with gtk+:bin added 
> and without python? If so, I'd find it preferable to mine. 

I cannot test the python removal right now, but I'll answer as soon I can build it.

Best regards,
Miguel

Information forwarded to guix-patches <at> gnu.org:
bug#37693; Package guix-patches. (Mon, 21 Oct 2019 17:22:02 GMT) Full text and rfc822 format available.

Message #26 received at 37693 <at> debbugs.gnu.org (full text, mbox):

From: Miguel Arruga Vivas <rosen644835 <at> gmail.com>
To: Leo Prikler <leo.prikler <at> student.tugraz.at>
Cc: Ludovic Courtès <ludo <at> gnu.org>, 37693 <at> debbugs.gnu.org
Subject: Re: [bug#37693] Seahorse build
Date: Mon, 21 Oct 2019 19:20:50 +0200
[Message part 1 (text/plain, inline)]
El Mon, 21 Oct 2019 18:59:39 +0200
Miguel <rosen644835 <at> gmail.com> escribió:
> I cannot test the python removal right now, but I'll answer as soon I
> can build it.

I confirm it works with the attached patch (without python as an
explicit dependency).

Best regards,
Miguel
[0001-gnu-seahorse-Update-to-3.30.1.1.patch (text/x-patch, attachment)]

Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Tue, 22 Oct 2019 16:29:02 GMT) Full text and rfc822 format available.

Notification sent to Leo Prikler <leo.prikler <at> student.tugraz.at>:
bug acknowledged by developer. (Tue, 22 Oct 2019 16:29:02 GMT) Full text and rfc822 format available.

Message #31 received at 37693-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Miguel Arruga Vivas <rosen644835 <at> gmail.com>
Cc: Leo Prikler <leo.prikler <at> student.tugraz.at>, 37693-done <at> debbugs.gnu.org
Subject: Re: [bug#37693] Seahorse build
Date: Tue, 22 Oct 2019 18:27:52 +0200
[Message part 1 (text/plain, inline)]
Hello,

Miguel Arruga Vivas <rosen644835 <at> gmail.com> skribis:

>>From c2cbf056d277842b79a5e4588ab38980ef9d8db9 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
>  <rosen644835 <at> gmail.com>
> Date: Mon, 21 Oct 2019 19:16:24 +0200
> Subject: [PATCH] gnu: seahorse: Update to 3.30.1.1.
>
> * gnu/packages/gnome.scm (seahorse)[version]: Update version number.
> [origin]: Update hash.  Add patch needed for compilation with our
> version of libsecret (0.19.1).
> [inputs]: Add avahi dependency.
> [native-inputs]: Add vala dependency.  Use gettext-minimal instead of
> intltool, as only xgettext is used.
> * gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch: New
> file retrieved from the upstream version control system
> https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667

Wonderful.  Applied with the changes below.

Thanks to the two of you!  :-)

Ludo’.

[Message part 2 (text/x-patch, inline)]
diff --git a/gnu/local.mk b/gnu/local.mk
index 4292e6f415..611761c2c9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1324,6 +1324,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/scotch-build-parallelism.patch		\
   %D%/packages/patches/scotch-integer-declarations.patch	\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
+  %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch	\
   %D%/packages/patches/seq24-rename-mutex.patch			\
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
   %D%/packages/patches/shishi-fix-libgcrypt-detection.patch	\
diff --git a/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch b/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch
index e236f6a2e1..55866d2973 100644
--- a/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch
+++ b/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch
@@ -1,3 +1,5 @@
+Patch from <https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667>.
+
 From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001
 From: Niels De Graef <nielsdegraef <at> gmail.com>
 Date: Sat, 11 May 2019 09:02:34 +0200

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 20 Nov 2019 12:24:08 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years and 130 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.