Bug#986760: unblock: seahorse/3.38.0.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package seahorse.
[ Reason ]
Fix key import dialog to wait for the key to be imported, rather than
cancelling the action before it starts.
(#931558, Severity: important in my opinion)
[ Impact ]
If not fixed, GNOME users cannot import GPG keys via a GUI and must use
the command-line.
[ Tests ]
Manual test:
- Obtained a public key that was not in my keyring and attempted to
import it with 3.38.0.1-1, confirmed failure (dialog closes immediately,
new key not present when asking the gpg CLI).
- Upgraded to 3.38.0.1-2, re-imported the key, confirmed success (a
spinner appears in the Import button for a while before the dialog
closes, new key is visible to the gpg CLI afterwards).
[ Risks ]
Minimal risk. It's a targeted fix to a UI element that previously
didn't work at all, so even a partial or imperfect solution would be
an improvement.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
If this cannot migrate in time for Debian 11.0, then I think a stable
update in 11.1 would be appropriate.
unblock seahorse/3.38.0.1-2
diffstat for seahorse-3.38.0.1 seahorse-3.38.0.1
changelog | 9 ++++++++
gbp.conf | 2 -
patches/ImportDialog-Fix-import-dialog.patch | 29 +++++++++++++++++++++++++++
patches/series | 2 -
4 files changed, 40 insertions(+), 2 deletions(-)
diff -Nru seahorse-3.38.0.1/debian/changelog seahorse-3.38.0.1/debian/changelog
--- seahorse-3.38.0.1/debian/changelog 2020-12-12 08:56:34.000000000 +0000
+++ seahorse-3.38.0.1/debian/changelog 2021-04-11 17:28:09.000000000 +0100
@@ -1,3 +1,12 @@
+seahorse (3.38.0.1-2) unstable; urgency=medium
+
+ * Team upload
+ * d/p/ImportDialog-Fix-import-dialog.patch:
+ Apply patch from upstream to fix GPG key import (Closes: #931558)
+ * d/gbp.conf: Switch branch to debian/bullseye
+
+ -- Simon McVittie <smcv@debian.org> Sun, 11 Apr 2021 17:28:09 +0100
+
seahorse (3.38.0.1-1) unstable; urgency=medium
* New upstream release
diff -Nru seahorse-3.38.0.1/debian/gbp.conf seahorse-3.38.0.1/debian/gbp.conf
--- seahorse-3.38.0.1/debian/gbp.conf 2020-12-12 08:56:34.000000000 +0000
+++ seahorse-3.38.0.1/debian/gbp.conf 2021-04-11 17:28:09.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/bullseye
upstream-branch = upstream/latest
[buildpackage]
diff -Nru seahorse-3.38.0.1/debian/patches/ImportDialog-Fix-import-dialog.patch seahorse-3.38.0.1/debian/patches/ImportDialog-Fix-import-dialog.patch
--- seahorse-3.38.0.1/debian/patches/ImportDialog-Fix-import-dialog.patch 1970-01-01 01:00:00.000000000 +0100
+++ seahorse-3.38.0.1/debian/patches/ImportDialog-Fix-import-dialog.patch 2021-04-11 17:28:09.000000000 +0100
@@ -0,0 +1,29 @@
+From: Jeremias Ortega <jeremias@ortega.tech>
+Date: Mon, 9 Nov 2020 22:39:01 -0600
+Subject: ImportDialog: Fix import dialog
+
+The import dialog fails to import files without showing any warning.
+The dialog closes before it finishes the import process and cancels it.
+
+This is solved by making the import button not return a response directly.
+
+Bug: https://gitlab.gnome.org/GNOME/seahorse/-/issues/236
+Bug-Debian: https://bugs.debian.org/931558
+Origin: upstream, 40~alpha, commit:6cc0fe7381a4c9536123bf877b3e055774b2f0a9
+---
+ src/import-dialog.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import-dialog.vala b/src/import-dialog.vala
+index 983b7e4..650aaa2 100644
+--- a/src/import-dialog.vala
++++ b/src/import-dialog.vala
+@@ -41,7 +41,7 @@ public class Seahorse.ImportDialog : Gtk.Dialog {
+ this.import.get_style_context().add_class("suggested-action");
+ this.import.importing.connect(() => this.viewer.clear_error());
+ this.import.imported.connect(on_import_button_imported);
+- add_action_widget(this.import, Gtk.ResponseType.OK);
++ ((Gtk.HeaderBar) get_header_bar()).pack_end(this.import);
+
+ this.viewer = new Gcr.ViewerWidget();
+ this.viewer.added.connect((v, r, parsed) => this.import.add_parsed(parsed));
diff -Nru seahorse-3.38.0.1/debian/patches/series seahorse-3.38.0.1/debian/patches/series
--- seahorse-3.38.0.1/debian/patches/series 2020-12-12 08:56:34.000000000 +0000
+++ seahorse-3.38.0.1/debian/patches/series 2021-04-11 17:28:09.000000000 +0100
@@ -1 +1 @@
-
+ImportDialog-Fix-import-dialog.patch
Reply to: