From patchwork Mon Oct 21 15:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Miguel Arruga Vivas X-Patchwork-Id: 15799 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0371A172A4; Mon, 21 Oct 2019 16:26:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 91C5817012 for ; Mon, 21 Oct 2019 16:26:34 +0100 (BST) Received: from localhost ([::1]:44100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMZZp-0005zI-Vp for patchwork@mira.cbaines.net; Mon, 21 Oct 2019 11:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMZZL-0005xJ-Rf for guix-patches@gnu.org; Mon, 21 Oct 2019 11:26:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMZZK-0006rt-0E for guix-patches@gnu.org; Mon, 21 Oct 2019 11:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMZZJ-0006ro-Ov for guix-patches@gnu.org; Mon, 21 Oct 2019 11:26:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iMZZJ-0002xy-It for guix-patches@gnu.org; Mon, 21 Oct 2019 11:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37693] Seahorse build References: In-Reply-To: Resent-From: Miguel Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Oct 2019 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 37693@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Leo Prikler Received: via spool by 37693-submit@debbugs.gnu.org id=B37693.157167152711344 (code B ref 37693); Mon, 21 Oct 2019 15:26:01 +0000 Received: (at 37693) by debbugs.gnu.org; 21 Oct 2019 15:25:27 +0000 Received: from localhost ([127.0.0.1]:57650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMZYl-0002wu-5z for submit@debbugs.gnu.org; Mon, 21 Oct 2019 11:25:27 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:35833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMZYg-0002wY-Nj for 37693@debbugs.gnu.org; Mon, 21 Oct 2019 11:25:25 -0400 Received: by mail-wr1-f52.google.com with SMTP id l10so14066879wrb.2 for <37693@debbugs.gnu.org>; Mon, 21 Oct 2019 08:25:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version; bh=aeMqktkRIrgGRRnDQpFizI1qzcUJK1rgTBANrO47fNc=; b=X5ET/+2zK/sf+YaUcnWRBrpXys2Eeoj8mYGpiVnkln5Zdw6p5pDNqe/TdUBUdXLa1l mDqtqArQ7wZ3qPQ+LXaGa/HYBjKZAKiQiPBG4ZW3uTh572B5JN5eYQD3uLcVq7Bq51sq yH65T+gWDXqzoQCeyJbfKXo28G9dIpfYFnmpjveW4D8EY5ejL/HM3PLsrgmAkMl0gbSs 7+hRxjG7bK9bWCOhbZ0TNrmxB0kVXIsH4DU1sf1LXYUOi+nzzsfPSeUPe6Eh3NR63QvK 9CieiYY1f+QoaW9oBw6TV9h7IeUbvxNzGLB8zG/q5P52NvtbDgI1mQARrT7vTDkxDeJA 7t+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version; bh=aeMqktkRIrgGRRnDQpFizI1qzcUJK1rgTBANrO47fNc=; b=KK6k6mxzbfg970ESqT/djjPkhoOKq/zJ4L4qjtC1bRrj4pHawWSZoeymVrDvf0Bref ex5cKQeVsc/ERPm/A3bIqyNa2XS8qMeX55EQWKVCDb8gKIqe7M1Xw7zGy+6SjUW3R1dS EeiUsiNc1/t7f9V3EtQs8WLhqCD+GIt9vmx2Q7HmeP6Salpo8+DVmwRKo1nUDsv6rC4Q DjakNYFnmiQwqgQA8V9mnP21Arw0dO545WXD6qOHw1h63ADCpx/zVv3ho+FszAmDzTTR 7eKJOFOmWbnQW6JKAxyXHYvXP4cr6NLXXZAHfDZeiSZMhAgcBlvh7VEo2fmxXfduLHHz hcIQ== X-Gm-Message-State: APjAAAWcsKGvfjlu02D9RMprwk02V4qpTChxnJ+sPAB65L02agTH/CLQ FymvNrrACQfxn/OOJzl0x1r6Wjk0 X-Google-Smtp-Source: APXvYqzqjiyHFKmZ4p3FWkUFt62md+HAqRlu9nU3ZFDa7GJ3fOMZrqWxCssqio3L8RAgGukrsx2E6w== X-Received: by 2002:a5d:51c2:: with SMTP id n2mr17412682wrv.149.1571671516368; Mon, 21 Oct 2019 08:25:16 -0700 (PDT) Received: from localhost (115.201.218.87.dynamic.jazztel.es. [87.218.201.115]) by smtp.gmail.com with ESMTPSA id a71sm14445443wme.11.2019.10.21.08.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 08:25:16 -0700 (PDT) Date: Mon, 21 Oct 2019 17:25:12 +0200 From: Miguel Arruga Vivas Message-ID: <20191021172512.2f21d05f@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From b91e64a997ab283a390f63c46a4665404fa33803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Sat, 19 Oct 2019 12:04:55 +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). * 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 --- gnu/packages/gnome.scm | 22 +++++++++++--- .../seahorse-gkr-use-0-on-empty-flags.patch | 30 +++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fafb93be08..4a759dbd1b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2223,7 +2223,7 @@ engineering.") (define-public seahorse (package (name "seahorse") - (version "3.30") + (version "3.30.1.1") (source (origin (method url-fetch) @@ -2232,8 +2232,19 @@ engineering.") version ".tar.xz")) (sha256 (base32 - "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp")))) - (build-system glib-or-gtk-build-system) + "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy")) + (patches (search-patches + "seahorse-gkr-use-0-on-empty-flags.patch")))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (inputs `(("gtk+" ,gtk+) ("gcr" ,gcr) @@ -2241,13 +2252,16 @@ engineering.") ("gpgme" ,gpgme) ("openldap" ,openldap) ("openssh" ,openssh) + ("avahi" ,avahi) ("libsecret" ,libsecret) ("libsoup" ,libsoup))) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("itstool" ,itstool) ("pkg-config" ,pkg-config) + ("python" ,python) + ("vala" ,vala) ("xmllint" ,libxml2))) (home-page "https://launchpad.net/gnome-themes-standard") (synopsis "Manage encryption keys and passwords in the GNOME keyring") 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 new file mode 100644 index 0000000000..e236f6a2e1 --- /dev/null +++ b/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch @@ -0,0 +1,30 @@ +From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001 +From: Niels De Graef +Date: Sat, 11 May 2019 09:02:34 +0200 +Subject: [PATCH] gkr: Use 0 on empty flags + +A Flags-type variable without any flag set can be replaced with 0, so +this is a safe thing to do. It also prevents us from having to deal with +the accidental API break in libsecret (see +https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19) +--- + gkr/gkr-keyring-add.vala | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala +index 4e92a520..f60c9a22 100644 +--- a/gkr/gkr-keyring-add.vala ++++ b/gkr/gkr-keyring-add.vala +@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog { + + var cancellable = Dialog.begin_request(this); + var service = Backend.instance().service; +- Secret.Collection.create.begin(service, this.name_entry.text, null, +- Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE, ++ Secret.Collection.create.begin(service, this.name_entry.text, null, 0, + cancellable, (obj, res) => { + /* Clear the operation without cancelling it since it is complete */ + Dialog.complete_request(this, false); +-- +2.23.0 + -- 2.23.0