From patchwork Mon Oct 21 17:20:50 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: 15800 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 82D45172F2; Mon, 21 Oct 2019 18:22:15 +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 30D9C172A4 for ; Mon, 21 Oct 2019 18:22:15 +0100 (BST) Received: from localhost ([::1]:45992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMbNm-0001Ch-OT for patchwork@mira.cbaines.net; Mon, 21 Oct 2019 13:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44791) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMbNg-0001A0-MW for guix-patches@gnu.org; Mon, 21 Oct 2019 13:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMbNb-0002dj-Rt for guix-patches@gnu.org; Mon, 21 Oct 2019 13:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMbNa-0002cf-Nc for guix-patches@gnu.org; Mon, 21 Oct 2019 13:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iMbNa-0008IG-Ez for guix-patches@gnu.org; Mon, 21 Oct 2019 13:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37693] Seahorse build Resent-From: Miguel Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Oct 2019 17:22:02 +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: Leo Prikler Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , 37693@debbugs.gnu.org Received: via spool by 37693-submit@debbugs.gnu.org id=B37693.157167847231804 (code B ref 37693); Mon, 21 Oct 2019 17:22:02 +0000 Received: (at 37693) by debbugs.gnu.org; 21 Oct 2019 17:21:12 +0000 Received: from localhost ([127.0.0.1]:57779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMbMl-0008Gt-Qu for submit@debbugs.gnu.org; Mon, 21 Oct 2019 13:21:12 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:54870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMbMg-0008Fu-Ff for 37693@debbugs.gnu.org; Mon, 21 Oct 2019 13:21:10 -0400 Received: by mail-wm1-f47.google.com with SMTP id p7so14253053wmp.4 for <37693@debbugs.gnu.org>; Mon, 21 Oct 2019 10:21:06 -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:in-reply-to:references :mime-version; bh=ny7bVScBw80o1K6vx8Wh9LDl5wKw016wls2x0FIIVyY=; b=mFYaftf6Xh4NKrFiW1XRZwROOLX3Xtg4b80AMK/4NwzCPaDu5+pa1H/jiEra6o1ykN nLYmLgZSzbZH+mHbM+zxdF5s7P00f7xZEA8w4vpy3RVQPTO6t+9W9DQFA+1Xr4xC2w/N Mab/UUlMsd1hwAkofOYRIO99l3RqgOUIivXKG/giK1AlW96OR+rq/hAPq3MlD96u1ri4 ysD4sAk0LU2EKvxpI4OnwqUyFaiDwiKWOUG1aNRI2SZUbTyq9Kf5eMO/GhKNrQApPdr7 dgga4tERxnpsOrhLYLMF3ThwJ60D8UWgmz+0UePE8cN0LC3maVjpnTBQuoSQB46uJLL/ 3kSw== 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:in-reply-to :references:mime-version; bh=ny7bVScBw80o1K6vx8Wh9LDl5wKw016wls2x0FIIVyY=; b=Q4Ll0nKK01Z/peVPx19iHRS5EyCm+Je+wYRw61E2N4izBgPYJOi8xGR6xeIHVk5rvs NZz2zQrCpPSBZi5eAZbEnVqOdWpNhIanqN4vC6AVCSirHWn/P0XNbQ/6V7uYA+Nbvb00 S/GGRPDgvtn2RSVoNOFLKDk+hHASCtJ9OlK7FpSGuDk3uzsfyyOQk7vy+/BFvYnBW1ez IlMojOqNWA/2zI2mNZ4NmvCAx/aSxnHYfNDrvzo6253m28ZFsXQ9G48goRLIj4o6LJuY qNqfxESjWs8O14sW0Qj2zyqInzoQC1wzeYTAKTVYa5vgY7giV8Iy8alQiSQwKT5x7p7R Mvvw== X-Gm-Message-State: APjAAAWPIbXrqcXJc3t7BOSyrbC09FAkZEhIywqv6EGPjLu0ELUjJ5w6 WQm+NybNe7lvNwGkJcDamBc= X-Google-Smtp-Source: APXvYqx0j/dn2RRaDqiFBeNNDZvm3fio4DFzXDei/60iM32O7la8bYGWqg3V/+wbgzV+zfYG5Ae9Cw== X-Received: by 2002:a1c:4d03:: with SMTP id o3mr3015836wmh.118.1571678460682; Mon, 21 Oct 2019 10:21:00 -0700 (PDT) Received: from localhost (156.pool85-48-187.static.orange.es. [85.48.187.156]) by smtp.gmail.com with ESMTPSA id p12sm16145277wrm.62.2019.10.21.10.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 10:21:00 -0700 (PDT) Date: Mon, 21 Oct 2019 19:20:50 +0200 From: Miguel Arruga Vivas Message-ID: <20191021192050.0a3eed23@gmail.com> In-Reply-To: <5dade403.1c69fb81.b296.84cc@mx.google.com> References: <5dade403.1c69fb81.b296.84cc@mx.google.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 El Mon, 21 Oct 2019 18:59:39 +0200 Miguel 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 From c2cbf056d277842b79a5e4588ab38980ef9d8db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= 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 --- gnu/packages/gnome.scm | 21 ++++++++++--- .../seahorse-gkr-use-0-on-empty-flags.patch | 30 +++++++++++++++++++ 2 files changed, 47 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..5cc915b4a9 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,15 @@ 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) + ("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