From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41737) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKM4X-0000lL-O8 for guix-patches@gnu.org; Tue, 15 Oct 2019 08:37:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKM4W-0001hh-Fh for guix-patches@gnu.org; Tue, 15 Oct 2019 08:37:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKM4W-0001hb-Cq for guix-patches@gnu.org; Tue, 15 Oct 2019 08:37:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iKM4W-0002M9-56 for guix-patches@gnu.org; Tue, 15 Oct 2019 08:37:04 -0400 Subject: [bug#37693] Seahorse build Resent-Message-ID: Message-ID: <2ab76f3e15613fb2b0944fe84b97feb55afc43e3.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 15 Oct 2019 14:36:01 +0200 In-Reply-To: <87a7a2w6qr.fsf@gnu.org> References: <87a7a2w6qr.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 37693@debbugs.gnu.org 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